Merge branch 'master' into federate

This commit is contained in:
Valentin Samir 2016-06-21 09:48:04 +02:00
commit 919f36bf54

View File

@ -1,4 +1,3 @@
Django >= 1.8,<1.10
tox==1.8.1 tox==1.8.1
pytest==2.6.4 pytest==2.6.4
pytest-django==2.7.0 pytest-django==2.7.0