Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml		2018-05-11 18:12:42 +02:00
..
account_serializer.rb	Bot nameplates (#7391)	2018-05-07 09:31:07 +02:00
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)	2018-05-02 15:57:37 +02:00
custom_emoji_serializer.rb	Feature: Unlisted custom emojis (#5485)	2017-10-27 16:11:30 +02:00
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
search_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
status_serializer.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
web_push_subscription_serializer.rb	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00