Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00
parent 1d70261350 c9dcc2d39f
commit 877a478466
1182 changed files with 15087 additions and 6745 deletions
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@ -39,7 +39,7 @@
            %h4= t 'footer.developers'
            %ul
              %li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
-              %li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
+              %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
          .column-2
            %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
            = link_to svg_logo, root_url, class: 'brand'