diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-12 23:36:52 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-12 23:36:52 -0800 |
| commit | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (patch) | |
| tree | 3d761e220c5e32aafedb7c17b198ec8215aec6d4 /config | |
| parent | 27cab0f507d253bba5658335f42a4c7675fcdac7 (diff) | |
| download | chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.tar.gz chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.tar.bz2 chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.zip | |
Fixes mm-1415 adding email bypass flag
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 3 | ||||
| -rw-r--r-- | config/config_docker.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index b0a019e8d..d5bb7e553 100644 --- a/config/config.json +++ b/config/config.json @@ -54,11 +54,12 @@ "ProfileHeight": 128 }, "EmailSettings": { + "ByPassEmail" : true, "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", "UseTLS": false, - "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com", + "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", "ApplePushCertPublic": "", diff --git a/config/config_docker.json b/config/config_docker.json index 85f0d9c73..91ed0ef10 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -54,9 +54,10 @@ "ProfileHeight": 128 }, "EmailSettings": { + "ByPassEmail" : true, "SMTPUsername": "", "SMTPPassword": "", - "SMTPServer": "localhost:25", + "SMTPServer": "", "UseTLS": false, "FeedbackEmail": "", "FeedbackName": "", |