Merged develop

This commit is contained in:
Jeremy Stretch
2017-02-28 16:10:53 -05:00
parent eddb8a2fbc
commit 691ea87444
29 changed files with 437 additions and 51 deletions

View File

@@ -3,6 +3,7 @@ cryptography>=1.4
Django>=1.10
django-debug-toolbar>=1.6
django-filter==0.15.3
django-mptt==0.8.7
django-rest-swagger==0.3.10
django-tables2>=1.2.5
djangorestframework>=3.5.0