Skip to content

S
sun
Commit cdbce727 authored by zhanglu's avatar zhanglu
Browse files
Options

Merge branch 'build' into 'master' 

settings_local

See merge request alpha/sun!30
parents 16255e87 d405f07c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
.gitignore
View file @ cdbce727
...@@ -91,3 +91,5 @@ dump.rdb ...@@ -91,3 +91,5 @@ dump.rdb
ascle/rpcd.json ascle/rpcd.json
.env .env
jmanage.py jmanage.py
sun/settings_local.py
sun/settings_local.py → sun/settings_local.py.bak
View file @ cdbce727
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# __author__ = "chenwei" # __author__ = "chenwei"
# Date: 2018/11/15 # Date: 2018/11/15
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment