Merge branch 'mongoectomy_implementation' into devel

This commit is contained in:
Chris Meyers
2016-03-01 08:22:40 -05:00
31 changed files with 5095 additions and 705 deletions

View File

@@ -21,6 +21,7 @@ django-auth-ldap==1.2.6
django-celery==3.1.17
django-crum==0.6.1
django-extensions==1.5.9
git+https://github.com/chrismeyersfsu/django-jsonbfield@fix-sqlite_serialization#egg=django-jsonbfield
django-polymorphic==0.7.2
django-radius==1.0.0
djangorestframework==3.3.2

View File

@@ -7,3 +7,4 @@ pytest
pytest-cov
pytest-django
pytest-pythonpath
pytest-mock

View File

@@ -13,3 +13,4 @@ pytest
pytest-cov
pytest-django
pytest-pythonpath
pytest-mock