Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: src/ContentMessages.tsx src/components/structures/UploadBar.tsx src/components/views/messages/MImageBody.js src/components/views/messages/MStickerBody.js src/components/views/messages/MVideoBody.tsx		2021-07-01 20:48:34 +01:00
..
structures	Remove reminescent references to the tinter	2021-06-30 08:09:55 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash	2021-07-01 20:48:34 +01:00
_common.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_components.scss	add message context menu icons	2021-06-24 22:20:50 +02: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