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
..
auth	…
avatars	…
context_menus	…
dialogs	Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD	2020-06-03 10:45:47 +01:00
directory	…
elements	Create and use stylised checkboxes	2020-05-28 22:33:00 +01:00
emojipicker	Fix Emoji Picker footer being too small if text overflows	2020-05-24 20:00:02 +01:00
groups	…
messages	…
right_panel	…
room_settings	…
rooms	Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD	2020-06-03 10:45:47 +01:00
settings	Fix sizing of the security warning icon	2020-06-02 21:54:38 +01:00
terms	…
verification	…
voip	…