Merge remote-tracking branch 'origin/master'

何全 · 何全 · commit ccc2409730ea · 2019-08-06T15:16:41.000+08:00
# Conflicts:
#	requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -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
