Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx		2021-04-29 09:52:21 +01:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-04-29 09:52:21 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-04-29 09:52:21 +01:00
_common.scss	Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation	2021-04-15 08:27:28 +01:00
_components.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-04-29 09:52:21 +01:00
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…