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
..
admin
keys
account_serializer.rb
announcement_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
encrypted_message_serializer.rb	Fix wrong route helper in encrypted messages controller (#13952)	2020-06-03 20:32:15 +02:00
featured_tag_serializer.rb
filter_serializer.rb
identity_proof_serializer.rb
instance_serializer.rb
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb	Add thumbnail_remote_url in MediaAttachment REST response (#14358)	2020-07-19 19:53:31 +02:00
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb	Add blurhash to preview cards (#13984)	2020-06-05 23:10:41 +02:00
reaction_serializer.rb
relationship_serializer.rb	Change design of account notes in web UI (#14208)	2020-07-07 01:24:03 +02:00
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb