Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 ... Conflicts: src/i18n/strings/en_EN.json		2021-05-11 14:07:47 +01:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-11 13:40:28 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179	2021-05-11 14:07:47 +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-05-06 08:05:14 +01: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