Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… · matrix-org/matrix-react-sdk@d212175 · GitHub

This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

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

Browse files

… t3chguy/fix/17282

� Conflicts:
�	package.json
�	yarn.lock

Loading branch information

t3chguy committed Jun 22, 2021

2 parents 49d20d2 + b3b9135 commit d212175