David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		2018-04-01 20:24:50 -05:00
..
account_serializer.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	2018-04-01 23:55:42 +02:00
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb
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	Display list column (#5750)	2017-11-25 00:35:37 +01:00
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	Do not re-query mentions from serializers (#6858)	2018-03-22 11:31:17 +01:00