mirror of
https://github.com/langgenius/dify.git
synced 2026-10-04 13:47:55 +08:00
# Conflicts: # api/controllers/mcp/mcp.py # api/controllers/openapi/__init__.py # api/controllers/web/login.py # api/controllers/web/wraps.py # api/extensions/ext_application_services.py # api/openapi/markdown/console-openapi.md # api/services/webapp_access_query_service.py # api/tests/unit_tests/controllers/web/test_web_login.py # api/tests/unit_tests/controllers/web/test_wraps.py # api/tests/unit_tests/extensions/test_ext_application_services.py # packages/contracts/generated/api/console/apps/orpc.gen.ts # packages/contracts/generated/api/console/apps/types.gen.ts # web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx # web/app/components/app/access-point/index.tsx # web/app/components/base/chat/chat/hooks.ts # web/app/components/base/file-uploader/hooks.ts # web/app/components/base/image-uploader/__tests__/hooks.spec.ts # web/app/components/base/image-uploader/hooks.ts # web/app/components/explore/try-app/index.tsx # web/features/agent-v2/agent-detail/__tests__/layout.spec.tsx # web/i18n/ar-TN/common.json # web/i18n/de-DE/common.json # web/i18n/en-US/common.json # web/i18n/es-ES/common.json # web/i18n/fa-IR/common.json # web/i18n/fr-FR/common.json # web/i18n/hi-IN/common.json # web/i18n/id-ID/common.json # web/i18n/it-IT/common.json # web/i18n/ja-JP/common.json # web/i18n/ko-KR/common.json # web/i18n/lo-LA/common.json # web/i18n/nl-NL/common.json # web/i18n/pl-PL/common.json # web/i18n/pt-BR/common.json # web/i18n/ro-RO/common.json # web/i18n/ru-RU/common.json # web/i18n/sl-SI/common.json # web/i18n/th-TH/common.json # web/i18n/tr-TR/common.json # web/i18n/uk-UA/common.json # web/i18n/vi-VN/common.json # web/i18n/zh-Hans/common.json # web/i18n/zh-Hant/common.json # web/service/console/query-policies.ts