You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
activitypub	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	7 years ago
rest	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
web	…
initial_state_serializer.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
manifest_serializer.rb	implement web share target (#6278)	7 years ago
oembed_serializer.rb	…
webfinger_serializer.rb	Remove rabl dependency (#5894)	7 years ago