Merge tag 'v3.2.0' into hometown-dev

2020-08-11 13:56:04 -07:00
parent 65dc8812c9 93dd413a47
commit 52cb64a183
676 changed files with 20549 additions and 6955 deletions
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@ -66,7 +66,7 @@ class LinkFooter extends React.PureComponent {
          />
          <FormattedMessage
            id='getting_started.hometown_open_source_notice'
-            defaultMessage='Hometown is also open source, at {hometown} (v1.0.4).'
+            defaultMessage='Hometown is also open source, at {hometown} (v1.0.5).'
            values={{ hometown: <span><a href='https://github.com/hometown-fork/hometown' rel='noopener' target='_blank'>hometown-fork/hometown</a></span> }}
          />
        </p>