Michael Telatynski 02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ...

 Conflicts:

	src/components/views/spaces/SpaceTreeLevel.tsx

	src/dispatcher/actions.ts

	src/i18n/strings/en_EN.json

2021-07-29 16:11:16 +01:00

..

controllers

Merge branch 'develop' into gsouquet/message-bubbles-4635

2021-06-30 08:58:20 +01:00

handlers

Improve and consolidate typing

2021-07-10 15:43:46 +01:00

watchers

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

Layout.ts

Add new layout switcher UI

2021-06-17 14:11:44 +01:00

SettingLevel.ts

Move SettingLevel to its own file

2020-07-28 11:37:59 -06:00

Settings.tsx

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

2021-07-29 16:11:16 +01:00

SettingsStore.ts

Move SettingsStore setting_updated dispatch to action enum

2021-07-27 17:19:45 +01:00

UIFeature.ts

Add a UI Feature flag for room history settings

2020-10-28 09:00:36 -06:00

WatchManager.ts

Fix watching settings

2021-06-05 01:16:52 -04:00