Michael Telatynski eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault ...

 Conflicts:

	src/components/views/dialogs/CreateRoomDialog.js

	src/components/views/dialogs/InviteDialog.js

	src/components/views/right_panel/UserInfo.js

	src/createRoom.js

2020-06-03 10:51:17 +01:00

..

structures

Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression

2020-05-31 21:17:14 +01:00

views

Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault

2020-06-03 10:51:17 +01:00

_common.scss

Dialog wrap title instead of taking same space as the close/cancel button

2020-05-28 16:48:50 +01:00

_components.scss

Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD

2020-06-03 10:45:47 +01:00

_font-sizes.scss

Create and use stylised checkboxes

2020-05-28 22:33:00 +01:00

rethemendex.sh

Remove sort and include new scss file in components

2020-04-02 13:42:59 +01:00