Michael Telatynski dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ...

 Conflicts:

	src/components/views/elements/MiniAvatarUploader.tsx

	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx

	src/i18n/strings/en_EN.json

	src/settings/handlers/RoomSettingsHandler.ts

	src/stores/SpaceStore.tsx

2021-07-15 10:04:48 +01:00

..

structures

Add dialpad to transfer dialog + various dialpad UI improvements (#6363)

2021-07-15 09:55:58 +01:00

views

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-15 10:04:48 +01:00

_common.scss

Add CSS containement rules for shorter reflow operations

2021-06-01 11:26:32 +01:00

_components.scss

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-15 10:04:48 +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