Merge branch 'release/0.1.3'

smn · Oct 2, 2015 · bf11056 · bf11056
2 parents 780b23d + c7ec2a1
commit bf11056
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:2.7
 MAINTAINER Praekelt Foundation <dev@praekeltfoundation.org>
-RUN pip install garelay==0.1.2
+RUN pip install garelay==0.1.3
 RUN pip install gunicorn
 RUN pip install supervisor
 RUN apt-get update

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/garelay/settings/base.py b/garelay/settings/base.py
@@ -8,7 +8,7 @@
 https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
-import os.environ
+import os
 from datetime import timedelta
 from os.path import abspath, dirname, join
 from django.conf import global_settings