Merge branch 'develop' into katex

2020-10-25 12:28:17 +00:00
parent 06b20fad95 646ed4c4d4
commit 4536f51ec0
157 changed files with 3749 additions and 2177 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -632,6 +632,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
        default: {},
    },
+    "Widgets.leftPanel": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: null,
+    },
    [UIFeature.AdvancedEncryption]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,