mastodon/app/serializers
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
..
activitypub Alternative handling of private self-boosts (#9998) 2019-02-13 18:36:23 +01:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
rss Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
web Only display web push notifications after API call (fixes #7902) (#8396) 2018-08-23 21:44:27 +02:00
initial_state_serializer.rb Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
manifest_serializer.rb Upgrade new Web Share Target API (#9963) 2019-02-02 01:26:49 +01:00
oembed_serializer.rb
webfinger_serializer.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00