multica/apps/desktop/electron
Naiyuan Qing 9bcb0993b1 Merge remote-tracking branch 'origin/main' into exec-approvals
# Conflicts:
#	apps/desktop/src/hooks/use-local-chat.ts
2026-02-05 17:54:19 +08:00
..
ipc Merge remote-tracking branch 'origin/main' into exec-approvals 2026-02-05 17:54:19 +08:00
electron-env.d.ts Merge remote-tracking branch 'origin/main' into exec-approvals 2026-02-05 17:54:19 +08:00
main.ts merge: resolve conflicts with origin/main 2026-02-04 14:04:47 +08:00
preload.ts Merge remote-tracking branch 'origin/main' into exec-approvals 2026-02-05 17:54:19 +08:00