imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bwindels/settings-config-doc

Browse source
This commit is contained in:
Bruno Windels 2020-04-01 11:43:03 +02:00
commit 66aea5eea5
947 changed files with 78891 additions and 33605 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/settings.md
View file

@ -15,7 +15,7 @@ order of prioirty, are:
* `room-account` - The current user's account, but only when in a specific room
* `account` - The current user's account
* `room` - A specific room (setting for all members of the room)
* `config` - Values are defined by `config.json`
* `config` - Values are defined by the `settingDefaults` key (usually) in `config.json`
* `default` - The hardcoded default for the settings
Individual settings may control which levels are appropriate for them as part of the defaults. This is often to ensure