Merge branch 'develop' into t3chguy/audio_output

This commit is contained in:
Michael Telatynski 2018-06-14 11:03:59 +01:00 committed by GitHub
commit 2454540bc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 2769 additions and 1448 deletions

View file

@ -278,4 +278,8 @@ export const SETTINGS = {
displayName: _td('Enable widget screenshots on supported widgets'),
default: false,
},
"PinnedEvents.isOpen": {
supportedLevels: ['room-device'],
default: false,
},
};