Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.		2020-07-07 15:58:45 +02:00
..
admin
keys	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
announcement_serializer.rb	Add support for links to statuses in announcements to be opened in web UI (#13212)	2020-03-08 16:10:48 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +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	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
tag_serializer.rb
web_push_subscription_serializer.rb