aboutsummaryrefslogtreecommitdiff
path: root/lib/mix/tasks/sample_config.eex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-12 08:26:26 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-12 08:26:26 +0000
commit3f42806b1b8f0a2c27dda4821ab61c92b9a4652f (patch)
treec8c3be8650849fe1a47d4c6a138dcfdf3a5b24c3 /lib/mix/tasks/sample_config.eex
parent564c73ab2496bee24ba46f69fc48662296041db6 (diff)
parentf34232da86ff051d7b1e5a9e6d8ff32ff54dbfcb (diff)
downloadpleroma-3f42806b1b8f0a2c27dda4821ab61c92b9a4652f.tar.gz
Merge branch 'develop' into 'develop'
Dedupe uploads See merge request pleroma/pleroma!115
Diffstat (limited to 'lib/mix/tasks/sample_config.eex')
-rw-r--r--lib/mix/tasks/sample_config.eex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index e37c864c0..6db36fa09 100644
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -8,7 +8,8 @@ config :pleroma, :instance,
name: "<%= name %>",
email: "<%= email %>",
limit: 5000,
- registrations_open: true
+ registrations_open: true,
+ dedupe_media: false
config :pleroma, :media_proxy,
enabled: false,