|  Michael Telatynski | a688e5b8b3 | Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx | 2021-09-06 11:41:09 +01:00 | 
				
					
						|  Michael Telatynski | bbd420096b | don't bother awaiting SpaceStore::setActiveSpace as it is no longer async | 2021-08-31 17:03:43 +01:00 | 
				
					
						|  Michael Telatynski | da110855f0 | delint and remove groups-specific tests and setups | 2021-08-11 15:36:35 +01:00 | 
				
					
						|  Michael Telatynski | 3c436c9617 | update setting naming to match style | 2021-07-30 12:20:02 +01:00 | 
				
					
						|  Michael Telatynski | 776435f620 | Switch all-rooms toggle for spaces to non-feature settings key | 2021-07-27 21:17:24 +01:00 | 
				
					
						|  Michael Telatynski | ec173e74e6 | Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload | 2021-07-27 20:15:40 +01:00 |