Merge branch 'master' into federate

This commit is contained in:
Valentin Samir
2016-06-19 13:22:32 +02:00
3 changed files with 12 additions and 5 deletions

View File

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