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
..
activitypub	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	2018-04-01 23:55:42 +02:00
rest	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
web	…
initial_state_serializer.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb	…
webfinger_serializer.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00