Merge branch 'master' into 'test'

settings.local See merge request !14

Merge branch 'master' into 'test'
settings.local See merge request !14
eacde34d · gaoming · 7b9815cb · 9cb92882 · eacde34d · eacde34d
Commit eacde34d authored Sep 20, 2019 by gaoming
Showing with 2 additions and 2 deletions

settings.cpython-36.pyc geoserver/__pycache__/settings.cpython-36.pyc +0 -0

settings_local.cpython-36.pyc geoserver/__pycache__/settings_local.cpython-36.pyc +0 -0

settings.py geoserver/settings.py +2 -2

No files found.
--- a/geoserver/__pycache__/settings.cpython-36.pyc
+++ b/geoserver/__pycache__/settings.cpython-36.pyc
--- a/geoserver/__pycache__/settings_local.cpython-36.pyc
+++ b/geoserver/__pycache__/settings_local.cpython-36.pyc
--- a/geoserver/settings.py
+++ b/geoserver/settings.py
@@ -159,4 +159,4 @@ REDIS_PORT=6379
 REDIS_DB=0
 #加载配置文件
-from .settings_local import *
+#from .settings_local import *
\ No newline at end of file