Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
2018-01-28 22:45:17 -06:00
parent 00ce2be148 e14c20582f
commit f4b2478af1
69 changed files with 2582 additions and 862 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -1230,15 +1230,6 @@
    ],
    "path": "app/javascript/mastodon/features/public_timeline/index.json"
  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "A look inside...",
-        "id": "standalone.public_title"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/standalone/community_timeline/index.json"
-  },
  {
    "descriptors": [
      {