summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorKaren Konou <konoukaren@gmail.com>2019-02-13 00:04:26 +0100
committerKaren Konou <konoukaren@gmail.com>2019-02-13 16:22:14 +0100
commitadcdd21f16c3364b293fefdd7008a531c0627317 (patch)
tree431ee39597218c3504d6c110f95ae84f70825706 /config
parent1d727cd0691fdedcd78d5ef22c07a1b280531037 (diff)
parent0534463cef059d1af1e90007e13e27207876dd9f (diff)
downloadpleroma-adcdd21f16c3364b293fefdd7008a531c0627317.tar.gz
pleroma-adcdd21f16c3364b293fefdd7008a531c0627317.zip
Merge branch 'develop' into hellthread-filter-fix
Diffstat (limited to 'config')
-rw-r--r--config/dev.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/dev.exs b/config/dev.exs
index 8f89aa03c..f77bb9976 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -16,7 +16,8 @@ config :pleroma, Pleroma.Web.Endpoint,
debug_errors: true,
code_reloader: true,
check_origin: false,
- watchers: []
+ watchers: [],
+ secure_cookie_flag: false
config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local