mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-04 10:14:00 +08:00
7947b7976b
Merge upstream release cd03e0a (hotfix/1.12.1-fix.0) into main
# Conflicts:
# api/.env.example
# api/controllers/service_api/app/annotation.py
# api/controllers/service_api/app/completion.py
# api/controllers/service_api/app/conversation.py
# api/controllers/service_api/app/message.py
# api/core/file/file_manager.py
# api/core/rag/datasource/retrieval_service.py
# api/extensions/ext_celery.py
# api/libs/gmpy2_pkcs10aep_cipher.py
# api/uv.lock
# web/pnpm-lock.yaml
# web/service/client.ts