matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2026-01-13 04:02:20 +03:00
Code Activity
Files
bbcd64263d16c781b95768f611da846a21842ca4
matrix-react-sdk/src/components
History
Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
..
structures
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
2021-06-22 21:15:53 +01:00
views
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
2021-06-22 21:15:53 +01:00