diff options
| author | lain <lain@soykaf.club> | 2020-05-04 10:43:20 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-04 10:43:20 +0200 |
| commit | c40afe5ba040964834657ef18f92bf9f1a1770d1 (patch) | |
| tree | 842774fee81293fc9f65a23beaa0a312acf7ab92 /config | |
| parent | 9249742f13445f47167d4b352751c49caf48aa8f (diff) | |
| parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
| download | pleroma-c40afe5ba040964834657ef18f92bf9f1a1770d1.tar.gz pleroma-c40afe5ba040964834657ef18f92bf9f1a1770d1.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/config/config.exs b/config/config.exs index 2e538c4be..a6c6d6f99 100644 --- a/config/config.exs +++ b/config/config.exs @@ -562,8 +562,6 @@ config :pleroma, :email_notifications, inactivity_threshold: 7 } -config :pleroma, :notifications, enable_follow_request_notifications: false - config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true, 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", |