Merge branch 'develop' into joriks/appearance-advanced

This commit is contained in:
Jorik Schellekens 2020-06-22 11:27:48 +01:00 committed by GitHub
commit 2294d23b32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 2203 additions and 710 deletions

View file

@ -142,7 +142,7 @@ export const SETTINGS = {
},
"feature_new_room_list": {
isFeature: true,
displayName: _td("Use the improved room list (in development - will refresh to apply changes)"),
displayName: _td("Use the improved room list (will refresh to apply changes)"),
supportedLevels: LEVELS_FEATURE,
default: false,
controller: new ReloadOnChangeController(),