Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.		2019-12-07 12:28:59 +01:00
..
admin
account_serializer.rb
application_serializer.rb
context_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
featured_tag_serializer.rb
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	2018-11-19 10:37:57 +01:00
identity_proof_serializer.rb
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
notification_serializer.rb	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
tag_serializer.rb
web_push_subscription_serializer.rb	Fix alerts booleans not being typecast correctly in push subscription (#11343)	2019-07-21 18:10:07 +02:00