diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-15 10:27:24 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-15 10:27:24 -0800 |
commit | d16a1d6d758c28ae2558232ba6da92798d7dfca3 (patch) | |
tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /config/config_docker.json | |
parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
parent | e017babc5ddd66e65469326bf723d5359875c2d1 (diff) | |
download | chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.tar.gz chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.tar.bz2 chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.zip |
Merge pull request #171 from mattermost/mm-1415
Fixes mm-1415 adding email bypass flag
Diffstat (limited to 'config/config_docker.json')
-rw-r--r-- | config/config_docker.json | 3 |
1 files changed, 2 insertions, 1 deletions
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": "", |