Merged develop

2026-01-10 05:42:16 -06:00 · 2017-02-28 16:10:53 -05:00
parent 8f42f59a80
commit c0152940f9
29 changed files with 437 additions and 51 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -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