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
..
EncryptionInfo.js	adapt encryption info to self-verification	2020-04-02 17:51:25 +02:00
EncryptionPanel.js	Avoid soft crash if unknown device in verification	2020-05-12 11:05:30 +01:00
GroupHeaderButtons.js	Convert view_user dispatch to prove the conversion works	2020-05-13 21:07:50 -06:00
HeaderButton.js	Various ARIA a11y fixes.	2019-10-03 09:35:39 +01:00
HeaderButtons.js	Move dispatcher into a subdirectory	2020-05-13 21:07:50 -06:00
RoomHeaderButtons.js	Convert view_user dispatch to prove the conversion works	2020-05-13 21:07:50 -06:00
UserInfo.js	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
VerificationPanel.js	Provide separate translatable for case where we have no device	2020-05-12 12:42:16 +01:00