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

Conflicts: README.md
2018-03-12 17:52:19 -05:00
parent 22f2750578 051b649628
commit f8e934f955
59 changed files with 330 additions and 183 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1375,6 +1375,14 @@
        "defaultMessage": "Block",
        "id": "confirmations.block.confirm"
      },
+      {
+        "defaultMessage": "Show more for all",
+        "id": "status.show_more_all"
+      },
+      {
+        "defaultMessage": "Show less for all",
+        "id": "status.show_less_all"
+      },
      {
        "defaultMessage": "Are you sure you want to block {name}?",
        "id": "confirmations.block.message"