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/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
This commit is contained in:
David Yip
2018-05-18 07:53:04 -05:00
parent 4c0770d6c8 57b503d4ef
commit e0eebba461
28 changed files with 136 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/public.html.haml
View File

@ -5,9 +5,9 @@
%span.single-user-login
= link_to t('auth.login'), new_user_session_path
—
%span.domain= link_to site_hostname, about_path
%span.footer__domain= link_to site_hostname, about_path
- else
%span.domain= link_to site_hostname, root_path
%span.footer__domain= link_to site_hostname, root_path
%span.powered-by
!= t('generic.powered_by', link: link_to('Mastodon', 'https://joinmastodon.org'))