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

 Conflicts:

	src/components/views/dialogs/InviteDialog.tsx

2021-06-03 16:22:59 +01:00

..

structures

Merge pull request #6079 from matrix-org/gsouquet/switch-rooms

2021-06-03 08:44:01 +01:00

views

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

2021-06-03 16:22:59 +01:00

_common.scss

Add CSS containement rules for shorter reflow operations

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

_components.scss

Extract UntrustedDeviceDialog and fix e2ee icon

2021-05-12 17:04:24 +01:00

_font-sizes.scss

…

_font-weights.scss

…

rethemendex.sh

…