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 /app/diagnostics.go | |
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 'app/diagnostics.go')
-rw-r--r-- | app/diagnostics.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 6726b8140..63bc506c3 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -284,7 +284,7 @@ func (a *App) trackConfig() { "max_users_per_team": *cfg.TeamSettings.MaxUsersPerTeam, "max_channels_per_team": *cfg.TeamSettings.MaxChannelsPerTeam, "teammate_name_display": *cfg.TeamSettings.TeammateNameDisplay, - "view_archived_channels": *cfg.TeamSettings.ViewArchivedChannels, + "experimental_view_archived_channels": *cfg.TeamSettings.ExperimentalViewArchivedChannels, "isdefault_site_name": isDefault(cfg.TeamSettings.SiteName, "Mattermost"), "isdefault_custom_brand_text": isDefault(*cfg.TeamSettings.CustomBrandText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT), "isdefault_custom_description_text": isDefault(*cfg.TeamSettings.CustomDescriptionText, model.TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT), |