Merge branch 'develop' into 'develop'

Dedupe uploads See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00 · 2018-06-12 08:26:26 +00:00 · 3f42806b1b
commit 3f42806b1b
parent 564c73ab24 f34232da86
4 changed files with 117 additions and 49 deletions
--- 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,