Merge branch 'master' into federate

2016-06-19 13:22:32 +02:00
parent e8a587f48a 155a919287
commit 8ab7352f4b
3 changed files with 12 additions and 5 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,3 +1,4 @@
+Django >= 1.8,<1.10
 setuptools>=5.5
 requests>=2.4
 requests_futures>=0.9.5