Merge branch 'develop' into feat/report-notification

2021-01-27 13:24:19 +02:00 · 2021-01-27 13:24:19 +02:00 · 8334649c11
commit 8334649c11
parent 54def7d210 11963de288
19 changed files with 684 additions and 211 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -740,6 +740,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": {