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

2017-10-13 10:20:25 +00:00 · 2017-10-13 10:20:25 +00:00 · 07e197dfa1
parent 872fc948c4 f5f0c7e715
commit 07e197dfa1
1 changed files with 1 additions and 1 deletions
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@ -193,7 +193,7 @@ export default {
    isFeatureEnabled: function(featureId: string): boolean {
        const featuresConfig = SdkConfig.get()['features'];

-        let sdkConfigValue = 'labs';
+        let sdkConfigValue = 'disable';
        if (featuresConfig && featuresConfig[featureId] !== undefined) {
            sdkConfigValue = featuresConfig[featureId];
        }