CopyleftConf/copyleftconf-website Changeset - 015b3ea9d1c2

Changeset - 015b3ea9d1c2

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

Christopher Neugebauer - 7 years ago 2017-09-18 03:27:20
chrisjrn@gmail.com

Merge branch 'prod'

1 file changed with 3 insertions and 1 deletions:

pinaxcon/settings.py

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -32,2 +32,4 @@ if from_email is not None: @@
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 # Local time zone for this installation. Choices can be found here:
@@ ... / @@ -45,3 +47,3 @@ admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None) @@
 if admin_email is not None:
     ADMINS = ("Webmaster", admin_email)
+    ADMINS = [("Webmaster", admin_email)]

0 comments (0 inline, 0 general)