mastodon/app/serializers
Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
nodeinfo Add `openRegistrations` attribute to nodeinfo endpoint (#12058) 2019-10-02 21:02:48 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
manifest_serializer.rb Add method and enctype to manifest (#11767) 2019-09-05 15:51:51 +02:00
oembed_serializer.rb Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00