Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +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
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	Add embed_url to preview cards (#5775)	2017-12-07 03:37:43 +01:00
relationship_serializer.rb	Break out nested relationship API keys (#5887)	2017-12-06 16:10:54 +01:00
report_serializer.rb
search_serializer.rb
status_serializer.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00