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

2018-07-11 17:57:08 +02:00
parent 612b00d1bb 7ac5151b74
commit 6f0f583abe
93 changed files with 908 additions and 91 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -693,6 +693,10 @@
      {
        "defaultMessage": "Muted users",
        "id": "navigation_bar.mutes"
+      },
+      {
+        "defaultMessage": "Muted words",
+        "id": "navigation_bar.filters"
      }
    ],
    "path": "app/javascript/mastodon/features/compose/components/action_bar.json"