mirror of
https://github.com/langgenius/dify.git
synced 2026-08-29 03:45:08 +08:00
fd124e6d32
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files. Preserve sandbox/agent/collaboration features while adopting main's UI refactorings (Dialog/AlertDialog/Popover), model provider updates, and enterprise features. Made-with: Cursor