Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-04-28 15:38:46 +01:00 · 2020-04-28 15:38:46 +01:00 · 1b83faaa8d
commit 1b83faaa8d
parent eb72245493 cf05beb4b8
51 changed files with 1699 additions and 333 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -165,12 +165,6 @@ export const SETTINGS = {
        displayName: _td("Show info about bridges in room settings"),
        default: false,
    },
-    "feature_invite_only_padlocks": {
-        isFeature: true,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Show padlocks on invite only rooms"),
-        default: true,
-    },
    "font_size": {
        displayName: _td("Font size"),
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,