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 /model | |
| 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 'model')
| -rw-r--r-- | model/config.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/model/config.go b/model/config.go index e38c993a8..a7044d9e1 100644 --- a/model/config.go +++ b/model/config.go @@ -1125,7 +1125,7 @@ type TeamSettings struct { MaxNotificationsPerChannel *int64 EnableConfirmNotificationsToChannel *bool TeammateNameDisplay *string - ViewArchivedChannels *bool + ExperimentalViewArchivedChannels *bool ExperimentalEnableAutomaticReplies *bool ExperimentalHideTownSquareinLHS *bool ExperimentalTownSquareIsReadOnly *bool @@ -1255,8 +1255,8 @@ func (s *TeamSettings) SetDefaults() { s.EnableUserCreation = NewBool(true) } - if s.ViewArchivedChannels == nil { - s.ViewArchivedChannels = NewBool(true) + if s.ExperimentalViewArchivedChannels == nil { + s.ExperimentalViewArchivedChannels = NewBool(false) } } |