Merge branch 'main' into feature/claude-code-templates

Browse Source

# Conflicts:
#	src-tauri/src/database/dao/mod.rs
#	src-tauri/src/database/schema.rs
#	src-tauri/src/lib.rs
#	src/App.tsx
#	src/i18n/locales/en.json
#	src/i18n/locales/ja.json
#	src/i18n/locales/zh.json

...

This commit is contained in:

YoVinchen

2026-01-14 00:45:20 +08:00

parent 4bbd63bf2b f3343992f2

commit 929ac54cc9

251 changed files with 21255 additions and 5768 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-tauri/src/database/schema.rs

+701 -286

File diff suppressed because it is too large Load Diff