diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-08-24 11:36:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 11:36:39 +0200 |
| commit | 5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06 (patch) | |
| tree | 8fa91548eb37ffa3370fb80160e971bb46d6775a /utils | |
| parent | bba3bbd9f3e250cca0ce705e664382fe3ad6e78a (diff) | |
| parent | d2945cdd77bdf1ee03367a0d45624094fb936c19 (diff) | |
| download | chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.tar.gz chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.tar.bz2 chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.zip | |
Merge release-5.2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go index 9e445bf5c..3ce2215a3 100644 --- a/utils/config.go +++ b/utils/config.go @@ -506,7 +506,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS) props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay props["ExperimentalPrimaryTeam"] = *c.TeamSettings.ExperimentalPrimaryTeam - props["ViewArchivedChannels"] = strconv.FormatBool(*c.TeamSettings.ViewArchivedChannels) + props["ExperimentalViewArchivedChannels"] = strconv.FormatBool(*c.TeamSettings.ExperimentalViewArchivedChannels) props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider) props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey |