Michael Telatynski 57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/views/spaces/SpacePanel.tsx		2021-08-12 12:05:55 +01:00
..
audio_messages	Remove unnecessary rescaling of voice waveforms	2021-08-03 13:51:11 -06:00
auth	lint	2021-08-02 13:28:56 +01:00
avatars	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1	2021-07-23 10:42:46 +01:00
beta	Change spaces beta feedback to not be so beta-centric	2021-07-23 15:47:11 +01:00
context_menus	Offer a way to create a space based on existing community	2021-08-04 10:37:35 +01:00
dialogs	Merge pull request #6543 from matrix-org/t3chguy/fix/18092	2021-08-12 11:28:14 +01:00
directory	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
elements	Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y	2021-08-11 23:18:52 +01:00
emojipicker	Adhere to better eslint rules	2021-07-23 10:35:10 +01:00
groups	Adhere to better eslint rules	2021-07-23 10:35:10 +01:00
host_signup	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
messages	Add a comment for weirdly placed div	2021-08-11 10:56:36 +02:00
right_panel	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092	2021-08-04 12:14:29 +01:00
room_settings	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
rooms	Remove unnecessary code	2021-08-12 08:53:42 +02:00
settings	Merge pull request #6543 from matrix-org/t3chguy/fix/18092	2021-08-12 11:28:14 +01:00
spaces	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-08-12 12:05:55 +01:00
terms	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
toasts	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
verification	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
voip	This doesn't need to be here as it was moved into CallViewButtons	2021-08-11 19:16:55 +02:00