Merge branch 'develop' into expand-codeblock

This commit is contained in:
Šimon Brandner 2021-01-18 17:54:06 +01:00
commit 8a4af2f348
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
23 changed files with 382 additions and 172 deletions

View file

@ -426,7 +426,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
default: true,
},
"allowedWidgets": {
supportedLevels: [SettingLevel.ROOM_ACCOUNT],
supportedLevels: [SettingLevel.ROOM_ACCOUNT, SettingLevel.ROOM_DEVICE],
supportedLevelsAreOrdered: true,
default: {}, // none allowed
},
"analyticsOptIn": {