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

Browse Source

 Conflicts:

	package.json

	yarn.lock

...

This commit is contained in:

Michael Telatynski

2021-06-22 21:29:52 +01:00

parent 49d20d2530 b3b9135b1f

commit d212175e63

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available