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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces1

Browse source 
 Conflicts:
	src/utils/objects.ts
This commit is contained in:
Michael Telatynski 2021-02-25 10:50:56 +00:00
commit 0f0edbfb14
45 changed files with 2606 additions and 675 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/settings/SettingsStore.ts
View file

@ -61,7 +61,7 @@ for (const key of Object.keys(LEVEL_HANDLERS)) {
LEVEL_HANDLERS[key] = new LocalEchoWrapper(LEVEL_HANDLERS[key]);
}
const LEVEL_ORDER = [
export const LEVEL_ORDER = [
SettingLevel.DEVICE,
SettingLevel.ROOM_DEVICE,
SettingLevel.ROOM_ACCOUNT,