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

Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
2018-02-04 16:36:19 -06:00
parent 530fcc1c14 38e0133e1b
commit a6fb1c58ee
35 changed files with 506 additions and 31 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -1230,6 +1230,15 @@
    ],
    "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": [
      {