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-08 18:29:14 -06:00

parent c953fc9fb7 ae849fdd46

commit ed91bd9c11

163 changed files with 7453 additions and 6686 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

2584

src/client.ts

File diff suppressed because it is too large Load Diff