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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
This commit is contained in:
David Yip
2018-01-19 15:22:10 -06:00
parent 2b2de41bc7 0b888acfd4
commit 2ca965c704
90 changed files with 375 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/mailer.text.erb
View File

@ -1,5 +1,5 @@
<%= yield %>
---
<%= t('application_mailer.signature', instance: site_hostname) %>
<%= t 'about.hosted_on', domain: site_hostname %>
<%= t('application_mailer.settings', link: settings_preferences_url) %>