tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge

Browse Source 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
This commit is contained in:
Thibaut Girka
2018-05-11 18:12:42 +02:00
parent 34142ab29c 352bae8c3e
commit 45fce0e496
110 changed files with 1476 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/accounts/show.html.haml
View File

@@ -8,6 +8,7 @@
%meta{ name: 'robots', content: 'noindex' }/
%link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
%link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/