mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-11 23:41:04 +02:00
Code Issues Projects Releases Wiki Activity
element-web/src/components
History
Michael Telatynski 4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-01 12:47:34 +01:00
..
structures
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
2021-07-01 12:47:34 +01:00
views
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
2021-07-01 12:47:34 +01:00