Merge remote-tracking branch 'duckie/main' into merge-duckie-main-2026-05-06

Browse Source

# Conflicts:
#	index.html
#	public/UITexts.example
#	public/renderer-config.example
#	src/App.tsx
#	src/components/login/LoginView.tsx
#	src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx
#	src/components/toolbar/ToolbarView.tsx
#	src/components/user-profile/UserContainerView.tsx

...

This commit is contained in:

Lorenzune

2026-05-06 04:23:15 +02:00

parent b4fab3f6b9 db2985d763

commit 71171dc205

57 changed files with 5714 additions and 3013 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

public/configuration/ui-config.example

+132 -1581

File diff suppressed because it is too large Load Diff