summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-18 14:10:47 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-18 14:10:47 -0700
commit3cd793fcb9bb02d5a130f277bff18f93db13d970 (patch)
treebab4b9b559874b4ee79a43064a8018eda2a5af34 /config
parent66425c97e49615111448aa24e31225dfa3b51cda (diff)
parent4f321383b33ab805f22e7172a54925b1cd353fcb (diff)
downloadchat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.gz
chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.bz2
chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.zip
Merge pull request #13 from rgarmsen2295/master
Remerge
Diffstat (limited to 'config')
-rw-r--r--config/config.json4
-rw-r--r--config/config_docker.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json
index 1b844c259..82e40a1c5 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,7 +1,7 @@
{
"LogSettings": {
- "ConsoleEnable": false,
- "ConsoleLevel": "DEBUG",
+ "ConsoleEnable": true,
+ "ConsoleLevel": "INFO",
"FileEnable": true,
"FileLevel": "INFO",
"FileFormat": "",
diff --git a/config/config_docker.json b/config/config_docker.json
index f2e56bef8..a90722a1d 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -58,7 +58,7 @@
"SMTPPassword": "",
"SMTPServer": "localhost:25",
"UseTLS": false,
- "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
+ "FeedbackEmail": "",
"FeedbackName": "",
"ApplePushServer": "",
"ApplePushCertPublic": "",