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
..
css	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
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault	2020-06-02 21:51:05 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider	2020-05-07 18:01:20 +01:00