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

 Conflicts:

	src/components/views/avatars/RoomAvatar.tsx

	test/stores/SpaceStore-test.ts

	test/test-utils.js

2021-07-19 16:47:31 +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-19 16:47:31 +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-19 16:47:31 +01:00

_font-sizes.scss

…

_font-weights.scss

…

rethemendex.sh

…