Merge remote-tracking branch 'origin/master'

# Conflicts:
#	requirements.txt
This commit is contained in:
何全
2019-08-06 15:16:41 +08:00

View File

@@ -35,7 +35,7 @@ daphne==2.3.0
decorator==4.3.0
defusedxml==0.6.0
dill==0.2.9
Django==2.2.2
Django==2.2.4
django-bootstrap3==11.0.0
django-bootstrap4==0.0.7
django-celery-beat==1.4.0