Merge branch 'develop' into madlittlemods/stablize-msc3030-timestamp-to-event

Browse Source

Conflicts:
	spec/unit/matrix-client.spec.ts
	src/client.ts

...

This commit is contained in:

Eric Eastwood

2022-12-13 16:18:33 -06:00

parent 9841f92415 193c38523c

commit fcf12b49e3

245 changed files with 22657 additions and 22186 deletions

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

1879

src/client.ts

File diff suppressed because it is too large Load Diff