mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 00:31:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src/components/views/settings/tabs
History
Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
..
room Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-09 08:13:39 +01:00
user Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-07 17:12:19 +02:00