summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-21 13:54:47 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-21 13:54:47 -0600
commit8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f (patch)
treeb5e95131caef98e33ecd4cce9c573dd4c8e0e4bf /config
parentdea84b1892be42e8d42db8b67862b56b38c0da75 (diff)
parenta2fa683c1b5fc0c62506e3ac40784b053eda6e3e (diff)
downloadchat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.tar.gz
chat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.tar.bz2
chat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.zip
Merge branch 'master' into PLT-7-client-infra
Diffstat (limited to 'config')
-rw-r--r--config/config.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index b00dbc201..076f795cc 100644
--- a/config/config.json
+++ b/config/config.json
@@ -108,4 +108,4 @@
"TokenEndpoint": "",
"UserApiEndpoint": ""
}
-}
+} \ No newline at end of file