From 1ba18e4442f09d9d3617ca3d0ac9cf3137aa75c7 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 10 Aug 2018 09:19:30 +0100
Subject: [PATCH] fixup! Merge branch 'master' into
feature/258-seperate-buckets
---
opentech/settings/base.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 70498eeb6..1789c6046 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -376,7 +376,7 @@ if 'REDIS_URL' in env:
else:
CELERY_TASK_ALWAYS_EAGER = True
-
+
# S3 configuration
if 'AWS_STORAGE_BUCKET_NAME' in env:
@@ -409,7 +409,6 @@ if 'AWS_STORAGE_BUCKET_NAME' in env:
'AWS_BUCKET_ACL': 'private',
}
-
+
MAILCHIMP_API_KEY = env.get('MAILCHIMP_API_KEY')
MAILCHIMP_LIST_ID = env.get('MAILCHIMP_LIST_ID')
-
--
GitLab