Merge branch 'develop' into travis/pinned-room-list

This commit is contained in:
Travis Ralston 2018-10-25 10:57:08 -06:00 committed by GitHub
commit 9cdb527163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 999 additions and 416 deletions

View file

@ -300,4 +300,9 @@ export const SETTINGS = {
displayName: _td('Show empty room list headings'),
default: true,
},
"showDeveloperTools": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Show developer tools'),
default: false,
},
};