mirror of
https://github.com/langgenius/dify.git
synced 2026-11-12 22:31:24 +08:00
# Conflicts: # api/controllers/console/workspace/account.py # api/controllers/web/migration.py # api/core/app/apps/message_based_app_generator.py # api/openapi/markdown/web-openapi.md # api/repositories/account/repository.py # api/services/conversation_service.py # api/services/message_service.py # api/services/web_conversation_service.py # api/tests/unit_tests/controllers/web/test_migration.py # api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py # api/tests/unit_tests/repositories/app/test_console_repository.py # api/tests/unit_tests/services/test_message_service.py # packages/contracts/generated/api/console/account/types.gen.ts # packages/contracts/generated/api/console/account/zod.gen.ts # packages/contracts/generated/api/console/errors.gen.ts # packages/contracts/generated/api/console/workspaces/errors.gen.ts # packages/contracts/generated/api/console/workspaces/orpc.gen.ts # packages/contracts/generated/api/web/errors.gen.ts # packages/contracts/generated/api/web/orpc.gen.ts # packages/contracts/generated/api/web/types.gen.ts # packages/contracts/generated/api/web/zod.gen.ts