Michael Telatynski 5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 ...

 Conflicts:

	src/components/views/dialogs/CreateRoomDialog.tsx

	src/components/views/messages/MImageBody.tsx

2021-07-23 10:42:46 +01:00

..

BaseAvatar.tsx

Adhere to better eslint rules

2021-07-23 10:35:10 +01:00

DecoratedRoomAvatar.tsx

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

GroupAvatar.tsx

Auto-fix lint errors

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

MemberAvatar.tsx

Adhere to better eslint rules

2021-07-23 10:35:10 +01:00

MemberStatusMessageAvatar.js

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

RoomAvatar.tsx

delint

2021-07-19 16:51:43 +01:00

WidgetAvatar.tsx

Auto-fix lint errors

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