diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-24 21:46:57 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-24 21:46:57 +0300 |
| commit | 055edd3d72504d3bfa8426b2fd90d49d97ad193b (patch) | |
| tree | 5cde475e72a5c01807d1ea17fff1e3fa63042dec /config/description.exs | |
| parent | 293281fcbdba793604316f16f42d0de5ed816941 (diff) | |
| parent | 28f822877fd9a524e442d13a3c0029ae797c875d (diff) | |
| download | pleroma-055edd3d72504d3bfa8426b2fd90d49d97ad193b.tar.gz pleroma-055edd3d72504d3bfa8426b2fd90d49d97ad193b.zip | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index f941349d5..6c931c152 100644 --- a/config/description.exs +++ b/config/description.exs @@ -23,7 +23,7 @@ config :pleroma, :config_description, [ key: :uploader, type: :module, description: "Module which will be used for uploads", - suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.MDII, Pleroma.Uploaders.S3] + suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.S3] }, %{ key: :filters, @@ -515,6 +515,7 @@ config :pleroma, :config_description, [ }, %{ key: :email, + label: "Admin Email Address", type: :string, description: "Email used to reach an Administrator/Moderator of the instance", suggestions: [ @@ -523,8 +524,9 @@ config :pleroma, :config_description, [ }, %{ key: :notify_email, + label: "Sender Email Address", type: :string, - description: "Email used for notifications", + description: "Envelope FROM address for mail sent via Pleroma", suggestions: [ "notify@example.com" ] |