diff options
| author | feld <feld@feld.me> | 2020-01-24 13:54:44 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-24 13:54:44 +0000 |
| commit | 0a5e7924542415ec2c28680b50d38909350aedeb (patch) | |
| tree | bfb4c6ba8d6071929c45d1bd0e01f36c63157e83 | |
| parent | 8533b63d1f75cad58560431aa762ce817f16d77c (diff) | |
| parent | e9d8a84790259572e59d79b75947b4ab81dc132b (diff) | |
| download | pleroma-0a5e7924542415ec2c28680b50d38909350aedeb.tar.gz pleroma-0a5e7924542415ec2c28680b50d38909350aedeb.zip | |
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
Better descriptions for email fields for admin-fe
Closes admin-fe#67
See merge request pleroma/pleroma!2138
| -rw-r--r-- | config/description.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs index 730d7d72b..6c931c152 100644 --- a/config/description.exs +++ b/config/description.exs @@ -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" ] |