Michael Telatynski efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/spaces/SpaceCreateMenu.tsx src/i18n/strings/en_EN.json		2021-07-29 15:16:53 +01:00
..
structures	Update feedback prompt to match designs	2021-07-28 17:56:57 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096	2021-07-29 15:16:53 +01:00
_common.scss	Inherit font-family	2021-06-26 20:53:14 +02:00
_components.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096	2021-07-29 15:16:53 +01:00
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…