Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ...

 Conflicts:

	src/SlashCommands.tsx

	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

	src/createRoom.ts

2021-07-09 08:13:39 +01:00

..

audio_messages

lint

2021-06-30 14:51:18 -06:00

auth

Eighth batch of burning

2021-07-03 11:24:33 +02:00

avatars

Add way to manage Restricted join rule in Room Settings

2021-07-02 14:51:55 +01:00

beta

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

context_menus

remove stale comment, we include vias now

2021-07-07 18:17:33 +01:00

dialogs

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-09 08:13:39 +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-09 08:13:39 +01:00

emojipicker

Fifth batch of burning

2021-07-03 10:06:42 +02: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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494

2021-07-08 13:29:10 +01:00

right_panel

Sixth batch of burning

2021-07-03 10:44:03 +02:00

room_settings

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

rooms

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-09 08:13:39 +01:00

settings

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-09 08:13:39 +01:00

spaces

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-09 08:13:39 +01:00

terms

Linting fix in TypeScript interface

2021-07-05 09:19:19 +02:00

toasts

lint

2021-07-01 15:11:18 +01:00

verification

Linting fix in TypeScript interface

2021-07-05 09:19:19 +02:00

voip

Comply with new member-delimiter-style rule

2021-07-01 23:23:03 +01:00