Merge remote-tracking branch 'upstream/dbkr/matrixrtcsession' into SimonBrandner/feat/e2ee-embeded

Browse Source

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

...

This commit is contained in:

Šimon Brandner

2023-09-04 16:10:15 +02:00

parent ae04cfc53e 0dbd3c2a58

commit 720e138199

45 changed files with 2866 additions and 2131 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

4523

yarn.lock

File diff suppressed because it is too large Load Diff