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

2018-08-11 15:45:42 +02:00
parent 741fb32bef 44680c46ed
commit 84a2587d44
83 changed files with 1184 additions and 293 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -557,6 +557,14 @@
        "defaultMessage": "Muted users",
        "id": "navigation_bar.mutes"
      },
+      {
+        "defaultMessage": "Feature on profile",
+        "id": "account.endorse"
+      },
+      {
+        "defaultMessage": "Don't feature on profile",
+        "id": "account.unendorse"
+      },
      {
        "defaultMessage": "Information below may reflect the user's profile incompletely.",
        "id": "account.disclaimer_full"