# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1448601495 21600
# Node ID 842c1343061c224d3652a4f12ae1aede705620a6
# Parent  9fc12bbc8c8117f357e5c8257d6bebb02911263f# Parent  51fce245dd47cf8c189ac6c5920dedc57ceaf218
Merge.

diff -r 9fc12bbc8c81 -r 842c1343061c sg101/settings/base.py
--- a/sg101/settings/base.py	Thu Nov 26 23:16:07 2015 -0600
+++ b/sg101/settings/base.py	Thu Nov 26 23:18:15 2015 -0600
@@ -367,5 +367,9 @@
     ],
 }
 
+# SSL related settings
+SESSION_COOKIE_SECURE = False
+CSRF_COOKIE_SECURE = False
+
 # Turn off warning about test runner behavior change
 SILENCED_SYSTEM_CHECKS = ['1_6.W001']