Michael Telatynski d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 ... Conflicts: src/components/structures/SpaceRoomDirectory.tsx		2021-05-06 13:06:50 +01:00
..
structures	Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent	2021-05-06 13:05:58 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176	2021-05-06 13:06:50 +01:00
_common.scss	Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation	2021-04-15 08:27:28 +01:00
_components.scss	Simple rendering of voice messages in the timeline	2021-05-03 11:41:14 -06:00
_font-sizes.scss	Use rem to guard against font scaling breakages	2020-07-16 20:15:28 +05:30
_font-weights.scss	Iterate PR, tweak margins	2020-08-18 12:00:56 +01:00
rethemendex.sh	Remove sort and include new scss file in components	2020-04-02 13:42:59 +01:00