diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /api/api.go | |
parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip |
Merge branch 'master' into PLT-25
Diffstat (limited to 'api/api.go')
-rw-r--r-- | api/api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api.go b/api/api.go index 4da1de62d..6c7eda0a2 100644 --- a/api/api.go +++ b/api/api.go @@ -20,7 +20,7 @@ func NewServerTemplatePage(templateName string) *ServerTemplatePage { return &ServerTemplatePage{ TemplateName: templateName, Props: make(map[string]string), - ClientProps: utils.ClientProperties, + ClientCfg: utils.ClientCfg, } } |