Merge remote-tracking branch 'origin/Dev' into feat/react19-modernization

Browse Source

# Conflicts:
#	src/components/backgrounds/BackgroundsView.tsx
#	src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx

...

This commit is contained in:

simoleo89

2026-05-19 20:40:07 +02:00

parent 989b132c6a de899c3138

commit 73b9f9319d

15 changed files with 429 additions and 232 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

src/assets/images/backgrounds/borders/border_17.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_18.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_19.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_20.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_21.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_22.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_23.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_24.webp

BIN

Binary file not shown.

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

src/assets/images/backgrounds/borders/border_25.webp

BIN

Binary file not shown.

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