Merge remote-tracking branch 'github.com/develop' into develop

Browse Source

# Conflicts:
#	package.json
#	src/components/views/rooms/EventTile.tsx
#	yarn.lock

...

This commit is contained in:

Nik Rozman

2025-06-01 20:28:25 +02:00

parent 2c42e95265 6bc117993d

commit 12bd062971

472 changed files with 13046 additions and 7390 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

14

res/img/element-icons/roomlist/room-list-item-skeleton.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 17 KiB