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

2018-03-19 14:49:36 +00:00 · 2018-03-19 14:49:36 +00:00 · 967623c784
parent 4fc0c3603c b4020bb715
commit 967623c784
1 changed files with 1 additions and 3 deletions
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@ -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(