Michael Telatynski 517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 ...

 Conflicts:

	src/components/structures/RightPanel.js

2020-09-08 18:04:24 +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

Consolidate all the work thus far

2020-09-08 15:43:38 +01:00

dialogs

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

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

directory

Fix missed copy

2020-03-16 12:28:20 +00:00

elements

Consolidate all the work thus far

2020-09-08 15:43:38 +01:00

emojipicker

Stop removing variation selector from quick reactions

2020-06-04 18:58:13 +03:00

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

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

2020-09-08 18:04:24 +01:00

room_settings

Remove create-react-class

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

rooms

Consolidate all the work thus far

2020-09-08 15:43:38 +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