mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-26 00:42:08 +02:00
Code Issues Projects Releases Wiki Activity
42,945 Commits 291 Branches 603 Tags
Commit Graph

55 Commits

Author SHA1 Message Date
Michael Telatynski
404009c8cb Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-02 23:46:12 +01:00
Michael Telatynski
9fcc2ced3d fix types some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:59:06 +01:00
Michael Telatynski
07e0a017e7 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:56:57 +01:00
Michael Telatynski
6802f9b4df unbreak copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:52:49 +01:00
Michael Telatynski
58718dab37 Convert ContextMenu to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:51:12 +01:00