diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:13:56 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:15:40 -0500 |
commit | bedc558809832ce6ef6063fe91656a0fff0e222c (patch) | |
tree | f844a11ae25f1866bffb79d9eaf0d66aa2babcd6 /config/description.exs | |
parent | b54c8813d632cb44c7deb207e91bd32f01f33794 (diff) | |
parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
download | pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.tar.gz pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.zip |
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Diffstat (limited to 'config/description.exs')
-rw-r--r-- | config/description.exs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 9d8e3b93c..7fac1e561 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2275,6 +2275,20 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :notifications, + type: :group, + description: "Notification settings", + children: [ + %{ + key: :enable_follow_request_notifications, + type: :boolean, + description: + "Enables notifications on new follow requests (causes issues with older PleromaFE versions)." + } + ] + }, + %{ + group: :pleroma, key: Pleroma.Emails.UserEmail, type: :group, description: "Email template settings", |