diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-05-29 14:00:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 14:00:46 +0200 |
| commit | 4f5fdb6f8959cdf7d7b2cb93ea77960429bcac8a (patch) | |
| tree | e258e996c7fff2e269ddd65cb8c76539482bca04 /utils/config.go | |
| parent | 792dae23ca2b23650b34f15b1aa7ad63907a82c4 (diff) | |
| download | chat-4f5fdb6f8959cdf7d7b2cb93ea77960429bcac8a.tar.gz chat-4f5fdb6f8959cdf7d7b2cb93ea77960429bcac8a.tar.bz2 chat-4f5fdb6f8959cdf7d7b2cb93ea77960429bcac8a.zip | |
fix bad merge (#8869)
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 d3fd733b7..00fd2642a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -448,6 +448,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/") props["SiteName"] = c.TeamSettings.SiteName props["EnableTeamCreation"] = strconv.FormatBool(*c.TeamSettings.EnableTeamCreation) + props["EnableUserCreation"] = strconv.FormatBool(*c.TeamSettings.EnableUserCreation) props["EnableUserDeactivation"] = strconv.FormatBool(*c.TeamSettings.EnableUserDeactivation) props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer) props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage |