Merge branch 'develop' into t3chguy/audio_output

2018-06-14 11:03:59 +01:00
parent 689b00c618 742a2d0111
commit 2454540bc0
65 changed files with 2769 additions and 1448 deletions
@@ -278,4 +278,8 @@ export const SETTINGS = {
        displayName: _td('Enable widget screenshots on supported widgets'),
        default: false,
    },
+    "PinnedEvents.isOpen": {
+        supportedLevels: ['room-device'],
+        default: false,
+    },
 };