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
..
v2
account_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
filter_serializer.rb
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb