Michael Telatynski 5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-17 13:31:00 +01:00
..
auth	Show a spinner when processing a registration email confirmation	2020-09-11 20:58:10 -06:00
avatars	Fix MemberAvatar props interface	2020-09-03 15:05:10 +01:00
context_menus	Don't show 'unpin' for persistent widgets	2020-09-10 14:30:35 +01:00
dialogs	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178	2020-09-17 13:31:00 +01:00
directory	Fix missed copy	2020-03-16 12:28:20 +00:00
elements	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178	2020-09-17 13:31:00 +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	Also hide bug reporting prompts from the Error Boundaries	2020-09-16 10:50:53 +01:00
right_panel	Clean up UserInfo to not show a blank Power Selector for users not in room	2020-09-16 15:23:08 +01:00
room_settings	Remove create-react-class	2020-08-29 12:14:16 +01:00
rooms	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178	2020-09-17 13:31:00 +01:00
settings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178	2020-09-17 13:31:00 +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