Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture

2020-08-28 17:26:10 +01:00
parent b9cfa95ceb 52e095fa61
commit 2823156ef6
100 changed files with 4228 additions and 1844 deletions
@@ -311,7 +311,7 @@ export default class AppTile extends React.Component {
            this.props.onEditClick();
        } else {
            // TODO: Open the right manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                IntegrationManagers.sharedInstance().openAll(
                    this.props.room,
                    'type_' + this.props.app.type,