Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 ... Conflicts: src/components/structures/RoomView.tsx src/components/views/right_panel/UserInfo.tsx		2021-06-03 08:42:05 +01:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606	2021-06-03 08:42:05 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606	2021-06-03 08:42:05 +01:00
_common.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_components.scss	Initial cut of Pinned event card in the right panel	2021-05-25 16:10:44 +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