Merge branch 'develop' into travis/pinned-room-list
This commit is contained in:
commit
9cdb527163
53 changed files with 999 additions and 416 deletions
|
@ -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,
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue