diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-14 12:06:08 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-14 12:06:08 +0000 |
| commit | 4e69d1239afdf97fe84a1772faa242b8e362b369 (patch) | |
| tree | b37250ceeea947d284cbff32fa5665a3bbdd15f9 /config | |
| parent | cdcdbd88da76f18c21da7f6f15a29883044902c8 (diff) | |
| parent | c1665fd94de456768ddd59b8873d1bd26878970d (diff) | |
| download | pleroma-4e69d1239afdf97fe84a1772faa242b8e362b369.tar.gz pleroma-4e69d1239afdf97fe84a1772faa242b8e362b369.zip | |
Merge branch 'feature/disable-account' into 'develop'
[#694] allow users to disable their own account
See merge request pleroma/pleroma!895
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 45034a775..8d44c96de 100644 --- a/config/config.exs +++ b/config/config.exs @@ -424,7 +424,8 @@ config :pleroma_job_queue, :queues, mailer: 10, transmogrifier: 20, scheduled_activities: 10, - background: 5 + background: 5, + user: 10 config :pleroma, :fetch_initial_posts, enabled: false, |