Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 ...

 Conflicts:

	src/components/structures/ScrollPanel.js

	src/components/views/rooms/AppsDrawer.js

2020-09-07 14:33:57 +01:00

..

auth

fix Registration Form

2020-08-29 18:28:15 +01:00

avatars

Fix MemberAvatar props interface

2020-09-03 15:05:10 +01:00

context_menus

Remove create-react-class

2020-08-29 12:14:16 +01:00

dialogs

Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup

2020-09-04 12:51:25 +01:00

directory

…

elements

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785

2020-09-07 14:33:57 +01:00

emojipicker

…

groups

Delint

2020-08-29 12:57:11 +01:00

messages

Merge pull request #5157 from matrix-org/t3chguy/crc1

2020-09-03 17:21:58 +01:00

right_panel

Fix HeaderButtons handler bindings

2020-09-04 12:14:43 +01:00

room_settings

Remove create-react-class

2020-08-29 12:14:16 +01:00

rooms

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785

2020-09-07 14:33:57 +01:00

settings

Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup

2020-09-04 12:51:25 +01:00

terms

Fix indentation

2020-07-16 18:12:11 +05:30

toasts

Fix eslint ts override tsx matching and delint

2020-08-29 01:11:08 +01:00

verification

Revert "Merge pull request #5125 from matrix-org/travis/spec-i18n"

2020-08-18 13:09:33 -06:00

voip

Merge pull request #5157 from matrix-org/t3chguy/crc1

2020-09-03 17:21:58 +01:00