From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 5 Nov 2014 12:25:42 +0000 (+0100)
Subject: update docker apps, add apt gpg keys
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e24ed5a83733c16292562d385009dd7b2a9057e4;p=timeside-diadems.git

update docker apps, add apt gpg keys
---

diff --git a/setup.py b/setup.py
index 7e0986c..11222d3 100755
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
         'simplejson',
         'scipy',
         'matplotlib',
-        'django>=1.4',
+        'django<1.7',
         'django-extensions',
         'djangorestframework',
         'south',