Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
admin
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
featured_tag_serializer.rb	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
filter_serializer.rb
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
marker_serializer.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00
preferences_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb	Remove deprecated GET /api/v1/search API (#11823)	2019-09-13 16:11:13 +02:00
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02: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