Michael Telatynski 4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx src/createRoom.ts		2021-07-01 12:47:34 +01:00
..
audio_messages	lint	2021-06-30 14:51:18 -06:00
auth	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
avatars	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
beta	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
context_menus	Auto-fix more errors	2021-06-29 13:26:09 +01:00
dialogs	Merge branch 'develop' into t3chguy/ts/4	2021-06-29 22:24:47 +01:00
directory	Fix long lines	2021-06-29 13:42:51 +01:00
elements	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-01 12:47:34 +01:00
emojipicker	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
groups	Auto-fix more errors	2021-06-29 13:26:09 +01:00
host_signup	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
messages	Fix linter + merge	2021-06-30 13:29:37 -06:00
right_panel	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
room_settings	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
rooms	Merge branch 'develop' into travis/new-audio	2021-06-30 13:25:41 -06:00
settings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-01 12:47:34 +01:00
spaces	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-01 12:47:34 +01:00
terms	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
toasts	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
verification	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
voip	Auto-fix lint errors	2021-06-29 13:11:58 +01:00