diff options
author | ThibG <thib@sitedethib.com> | 2019-03-10 20:43:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-10 20:43:54 +0100 |
commit | 3cef04610cd809c7bd01adc00d34fb3d25261a16 (patch) | |
tree | bf279e7af52036451cf1c1fdc68b7b5748b5921d /app/views | |
parent | 42cc93e8923a1b6cdb61574e9a86e360cba56abb (diff) | |
parent | dfe7322922e869ae72edb9b8980b905876db9ed0 (diff) |
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/about/_forms.html.haml | 2 | ||||
-rw-r--r-- | app/views/about/_links.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/about/_forms.html.haml b/app/views/about/_forms.html.haml index 81f7173f7..78a422690 100644 --- a/app/views/about/_forms.html.haml +++ b/app/views/about/_forms.html.haml @@ -1,7 +1,7 @@ - if @instance_presenter.open_registrations = render 'registration' - else - = link_to t('auth.register_elsewhere'), 'https://joinmastodon.org', class: 'button button-primary' + = link_to t('auth.register_elsewhere'), 'https://joinmastodon.org/#getting-started', class: 'button button-primary' .closed-registrations-message - if @instance_presenter.closed_registrations_message.blank? diff --git a/app/views/about/_links.html.haml b/app/views/about/_links.html.haml index f79c37e65..381f301f9 100644 --- a/app/views/about/_links.html.haml +++ b/app/views/about/_links.html.haml @@ -11,6 +11,6 @@ = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' %li= link_to t('about.about_this'), about_more_path %li - = link_to 'https://joinmastodon.org/' do + = link_to 'https://joinmastodon.org/#getting-started' do = "#{t('about.other_instances')}" %i.fa.fa-external-link{ style: 'padding-left: 5px;' } |