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

2020-01-25 16:50:24 +01:00
parent 340cb4a04c 48c55b6392
commit 27ddcddcd3
67 changed files with 1136 additions and 376 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -2319,6 +2319,10 @@
        "defaultMessage": "Bookmark",
        "id": "status.bookmark"
      },
+      {
+        "defaultMessage": "More",
+        "id": "status.more"
+      },
      {
        "defaultMessage": "Mute @{name}",
        "id": "status.mute"