diff options
author | Sean King <seanking2919@protonmail.com> | 2021-12-29 18:08:50 -0700 |
---|---|---|
committer | Sean King <seanking2919@protonmail.com> | 2021-12-29 18:08:50 -0700 |
commit | ffeae7ef2c682dfadc01b4fae01807ad0f026fd4 (patch) | |
tree | 35183398384c21975d16264cc43b8efddbe10710 /config/description.exs | |
parent | 8ef1d8b566147922c93528b0b60d00fb9e63686b (diff) | |
parent | 84420d9439bf2bc161507a19778da00b5d990d70 (diff) | |
download | pleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.tar.gz pleroma-ffeae7ef2c682dfadc01b4fae01807ad0f026fd4.zip |
Fix merge conflict in CHANGELOG.md
Diffstat (limited to 'config/description.exs')
-rw-r--r-- | config/description.exs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 517077acf..ea3f34abe 100644 --- a/config/description.exs +++ b/config/description.exs @@ -941,6 +941,12 @@ config :pleroma, :config_description, [ key: :profile_directory, type: :boolean, description: "Enable profile directory." + }, + %{ + key: :privileged_staff, + type: :boolean, + description: + "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)" } ] }, |