Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
admin	…
account_serializer.rb	…
announcement_serializer.rb	…
application_serializer.rb	…
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	…
custom_emoji_serializer.rb	…
featured_tag_serializer.rb	…
filter_serializer.rb	…
identity_proof_serializer.rb	…
instance_serializer.rb	…
list_serializer.rb	…
marker_serializer.rb	…
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
poll_serializer.rb	…
preferences_serializer.rb	…
preview_card_serializer.rb	…
reaction_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	…