Merge pull request #6347 from vector-im/luke/feature-tag-panel-out-of-labs

Take TagPanel out of labs
2018-03-19 14:49:29 +00:00
parent 202ada7c23 f5a58258f9
commit b4020bb715
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(