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

 Conflicts:

	package.json

	yarn.lock

2021-06-14 21:39:06 +01:00

..

permalinks

Fix test

2021-06-07 16:54:53 -05:00

arrays-test.ts

Improve visible waveform for voice messages

2021-05-13 22:20:08 -06:00

enums-test.ts

…

generate-megolm-test-vectors.py

…

iterables-test.ts

…

maps-test.ts

…

MegolmExportEncryption-test.js

…

numbers-test.ts

…

objects-test.ts

…

sets-test.ts

…

ShieldUtils-test.js

…

Singleflight-test.ts

…

stringOrderField-test.ts

Use alphabet from js-sdk

2021-06-14 21:32:11 +01:00

test-utils.ts

…