diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
commit | bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (patch) | |
tree | 1626d089802a92ee208b6e7fa056378e40568a92 /docker | |
parent | 581785f5044eecdc7cf664e4c7fc59efc6babc96 (diff) | |
parent | 9bba6c79882d1f5d14b98052caf59a11fc2388d5 (diff) | |
download | chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.gz chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.bz2 chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.zip |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'docker')
-rw-r--r-- | docker/dev/config_docker.json | 2 | ||||
-rw-r--r-- | docker/local/config_docker.json | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index cbd771b71..e831bbb3a 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -68,6 +68,8 @@ }, "EmailSettings": { "EnableSignUpWithEmail": true, + "EnableSignInWithEmail": true, + "EnableSignInWithUsername": false, "SendEmailNotifications": false, "RequireEmailVerification": false, "FeedbackName": "", diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index cbd771b71..e831bbb3a 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -68,6 +68,8 @@ }, "EmailSettings": { "EnableSignUpWithEmail": true, + "EnableSignInWithEmail": true, + "EnableSignInWithUsername": false, "SendEmailNotifications": false, "RequireEmailVerification": false, "FeedbackName": "", |