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

2019-02-12 20:32:48 +01:00
parent a3ba28eb17 2f80a348c9
commit 0e34e91661
101 changed files with 2587 additions and 351 deletions
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -302,6 +302,7 @@
  "status.block": "Block @{name}",
  "status.cancel_reblog_private": "Unboost",
  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",