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

 Conflicts:

	src/stores/SpaceStore.tsx

2021-06-22 17:38:05 +01:00

..

controllers

Create and use Incompatible Settings Controller

2021-02-19 13:06:45 +00:00

handlers

Handle migration from useIRCLayout to layout

2021-01-26 13:30:34 +01:00

watchers

…

Layout.ts

Added LayoutPropType

2021-02-05 08:16:06 +01:00

SettingLevel.ts

…

Settings.tsx

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

2021-06-22 17:38:05 +01:00

SettingsStore.ts

Iterate PR

2021-06-17 16:22:40 +01:00

UIFeature.ts

…

WatchManager.ts

Fix watching settings

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