Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

2021-01-23 22:45:25 +00:00 · 2021-01-23 22:45:25 +00:00 · 87ae0eaa15
commit 87ae0eaa15
parent edb5826072 28ebb8b0ae
30 changed files with 549 additions and 494 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -733,6 +733,10 @@
      "quarantine": "Disallow user posts from federating",
      "delete_user": "Delete user",
      "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "roles": {
+      "admin": "Admin",
+      "moderator": "Moderator"
    }
  },
  "user_profile": {