gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-03-19 14:49:36 +00:00
parent 4fc0c3603c b4020bb715
commit 967623c784
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/LeftPanel.js
View File

@ -193,9 +193,7 @@ var LeftPanel = React.createClass({
}, },
); );
const tagPanelEnabled = const tagPanelEnabled = !SettingsStore.getValue("TagPanel.disableTagPanel");
SettingsStore.isFeatureEnabled("feature_tag_panel") &&
!SettingsStore.getValue("TagPanel.disableTagPanel");
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />; const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames( const containerClasses = classNames(