Merge origin/main into nightly

Resolve conflicts:
- .gitignore: keep nightly additions (.test, skills-lock.json)
- relay/helper/price.go: keep both billingexpr and model imports
- en.json / zh-CN.json: keep nightly's superset of i18n entries
- service/billing_session.go: add missing 3rd arg to DecreaseUserQuota
- en.json / zh-CN.json: deduplicate 129+320 duplicate i18n keys

This commit is contained in:

CaIon

2026-04-23 21:23:40 +08:00

parent 55b7e485c1 11f8d42d66

commit 6bde1a9c8d

117 changed files with 9031 additions and 2910 deletions

.gitignore

+1 -1

View File

@@ -31,4 +31,4 @@ data/
 .gopath
 .test
 token_estimator_test.go
 skills-lock.json
 skills-lock.json