diff options
author | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
commit | 6fb96f64c13597bcf8d10f30442ac61610cec58e (patch) | |
tree | 29db6b5d77a562dd496618ebcd54c15574f093a8 /config/description.exs | |
parent | 4dfc617cdf1c2579f4f941dcd0fa5c728178df06 (diff) | |
parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
download | pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.tar.gz pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
Diffstat (limited to 'config/description.exs')
-rw-r--r-- | config/description.exs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/config/description.exs b/config/description.exs index 7fac1e561..9d8e3b93c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2275,20 +2275,6 @@ 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", |