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

2018-04-06 10:24:36 +00:00
parent 40b71a681f fb9b376cb8
commit d1c7187db0
1 changed files with 1 additions and 1 deletions
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -102,7 +102,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
    _readFeature(featureName) {
        if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest()) {
            // Guests should not have any labs features enabled.
-            return {enabled: false};
+            return false;
        }

        const value = localStorage.getItem("mx_labs_feature_" + featureName);