diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
commit | bc4f77b10bb4360ac00d1999b1d08fa55e1fa547 (patch) | |
tree | 8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485 /config/dev.exs | |
parent | dcf24a3233bb50689d26f9d7833f98158730ce35 (diff) | |
parent | 3b141194715e362d65482672d00b10991d102fa2 (diff) | |
download | pleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.tar.gz pleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.zip |
[#468] Merged `upstream/develop`, resolved conflicts.
Diffstat (limited to 'config/dev.exs')
-rw-r--r-- | config/dev.exs | 3 |
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 |