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

…-labs Take TagPanel out of labs
element-hq · Mar 19, 2018 · b4020bb · b4020bb
2 parents 202ada7 + f5a5825
commit b4020bb
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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(