diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
| commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
| tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /utils/config.go | |
| parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
| parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
| download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip | |
Fixing merge conflict
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index c1e3a8d2a..fd9856a67 100644 --- a/utils/config.go +++ b/utils/config.go @@ -182,6 +182,7 @@ func getClientConfig(c *model.Config) map[string]string { props["SiteName"] = c.TeamSettings.SiteName props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation) + props["RestrictTeamNames"] = strconv.FormatBool(*c.TeamSettings.RestrictTeamNames) props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider) |