riot-web

Author	SHA1	Message	Date
Michael Telatynski	3dbcb5efa3	Merge branch 'develop' of https://github.com/vector-im/element-web into dbkr/stateafter # Conflicts: # test/unit-tests/components/structures/RoomView-test.tsx # test/unit-tests/components/structures/TimelinePanel-test.tsx	2024-11-27 10:47:35 +00:00
Tulir Asokan	72a2773629	Start sending stable `m.marked_unread` events (#28478 ) * Start sending stable `m.marked_unread` events * Update tests	2024-11-18 10:25:36 +00:00
Michael Telatynski	044eaf7eb5	Update calls to addEventToTimeline and addLiveEvents for new signature Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-11-06 14:55:21 +00:00
Michael Telatynski	f0ee7f7905	Merge matrix-react-sdk into element-web Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-10-15 15:32:09 +01:00
Michael Telatynski	b084ff2313	Prepare for repo merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-10-15 11:35:21 +01:00