Michael Telatynski 50a9394c59 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4 ...

 Conflicts:

	src/components/views/room_settings/RoomPublishSetting.tsx

2021-07-14 18:36:12 +01:00

..

blurhash.worker.ts

…

indexeddb.worker.ts

improve typing in the idb worker

2021-07-14 17:53:42 +01:00