Merge branch 'develop' into katex

2020-11-10 18:19:20 +00:00 · 2020-11-10 18:19:20 +00:00 · 5f3af7863a
commit 5f3af7863a
parent 839bae21ae 0766519467
151 changed files with 4951 additions and 1527 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@ -636,6 +636,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        default: null,
    },
+    [UIFeature.RoomHistorySettings]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
    [UIFeature.AdvancedEncryption]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,