diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-12 08:26:26 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-12 08:26:26 +0000 |
| commit | 3f42806b1b8f0a2c27dda4821ab61c92b9a4652f (patch) | |
| tree | c8c3be8650849fe1a47d4c6a138dcfdf3a5b24c3 /lib/mix | |
| parent | 564c73ab2496bee24ba46f69fc48662296041db6 (diff) | |
| parent | f34232da86ff051d7b1e5a9e6d8ff32ff54dbfcb (diff) | |
| download | pleroma-3f42806b1b8f0a2c27dda4821ab61c92b9a4652f.tar.gz | |
Merge branch 'develop' into 'develop'
Dedupe uploads
See merge request pleroma/pleroma!115
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/tasks/sample_config.eex | 3 |
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, |