Merge branch 'master' into glitch-soc/merge-upstream

2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@ -42,6 +42,6 @@
            %h4= t 'footer.more'
            %ul
              %li= link_to t('about.source_code'), Mastodon::Version.source_url
-              %li= link_to 'joinmastodon.org', 'https://joinmastodon.org'
+              %li= link_to t('about.apps'), 'https://joinmastodon.org/apps'

 = render template: 'layouts/application'