mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 00:21:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src/components
History
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
..
structures Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:42:05 +01:00
views Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:42:05 +01:00