Merge remote-tracking branch 'upstream/main'

Browse Source

# Conflicts:
#	backend/internal/server/api_contract_test.go
#	backend/internal/service/setting_service.go
#	deploy/docker-compose.yml
#	frontend/src/components/layout/AppSidebar.vue
#	frontend/src/views/admin/SettingsView.vue

...

This commit is contained in:

huangzhenpc

2026-04-27 17:01:41 +08:00

parent 6a9bfee222 c92b88e34a

commit 11ddf1f366

997 changed files with 221727 additions and 36134 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

2527

backend/internal/service/setting_service.go

File diff suppressed because it is too large Load Diff