Merge branch 'develop' into develop-2.8

This commit is contained in:
Jeremy Stretch
2020-03-03 13:20:00 -05:00
77 changed files with 1331 additions and 565 deletions

View File

@@ -13,6 +13,7 @@ django-taggit-serializer==0.1.7
django-timezone-field==4.0
djangorestframework==3.10.3
drf-yasg[validation]==1.17.0
gunicorn==20.0.4
Jinja2==2.10.3
Markdown==2.6.11
netaddr==0.7.19
@@ -23,3 +24,4 @@ pycryptodome==3.9.4
PyYAML==5.3
redis==3.3.11
svgwrite==1.3.1
wheel==0.34.2