mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-15 20:54:59 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
967623c784
@ -193,9 +193,7 @@ var LeftPanel = React.createClass({
|
||||
},
|
||||
);
|
||||
|
||||
const tagPanelEnabled =
|
||||
SettingsStore.isFeatureEnabled("feature_tag_panel") &&
|
||||
!SettingsStore.getValue("TagPanel.disableTagPanel");
|
||||
const tagPanelEnabled = !SettingsStore.getValue("TagPanel.disableTagPanel");
|
||||
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
|
||||
|
||||
const containerClasses = classNames(
|
||||
|
Loading…
Reference in New Issue
Block a user