diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-11 13:01:11 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-11 13:01:11 +0000 |
| commit | e4e3fd7e5552db274655d58bbbec1e4faabf7ccd (patch) | |
| tree | 744524f1eac36a5c6d3b0cfb0aa121e920c86dbc /config | |
| parent | 6c491b2006ef2f279e6ffbb4ac007b7740c6d50d (diff) | |
| parent | 59e16fc45a2fe1fa6bfeaecaa35f485b8a34bb6d (diff) | |
| download | pleroma-e4e3fd7e5552db274655d58bbbec1e4faabf7ccd.tar.gz | |
Merge branch 'fix/1019-refactor' into 'develop'
Fix/1019 refactor
See merge request pleroma/pleroma!1397
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 0d3419102..99b500993 100644 --- a/config/config.exs +++ b/config/config.exs @@ -250,13 +250,7 @@ config :pleroma, :instance, skip_thread_containment: true, limit_to_local_content: :unauthenticated, dynamic_configuration: false, - external_user_synchronization: [ - enabled: false, - # every 2 hours - interval: 60 * 60 * 2, - max_retries: 3, - limit: 500 - ] + external_user_synchronization: true config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |