Merge branch 'build' into 'master'

settings_local See merge request alpha/sun!30

Merge branch 'build' into 'master'
settings_local See merge request alpha/sun!30
cdbce727 · zhanglu · 16255e87 · d405f07c · cdbce727 · cdbce727
Commit cdbce727 authored Dec 13, 2018 by zhanglu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitignore .gitignore +2 -0

settings_local.py.bak sun/settings_local.py.bak +0 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@ dump.rdb
 ascle/rpcd.json
 .env
 jmanage.py
+
+sun/settings_local.py
--- a/sun/settings_local.py
+++ b/sun/settings_local.py
@@ -2,4 +2,3 @@
 # -*- coding: utf-8 -*-
 # __author__ = "chenwei"
 # Date: 2018/11/15
-