dify/api/controllers
lyzno1 67762cf1d8
chore: resolve merge conflict in pnpm-lock.yaml
Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.

Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged
2025-10-13 11:53:43 +08:00
..
common feat: API docs for service api (#24425) 2025-08-25 09:26:54 +08:00
console chore: resolve merge conflict in pnpm-lock.yaml 2025-10-13 11:53:43 +08:00
files feat: knowledge pipeline (#25360) 2025-09-18 12:49:10 +08:00
inner_api remove .value (#26633) 2025-10-11 09:08:29 +08:00
mcp chore: add ast-grep rule to convert Optional[T] to T | None (#25560) 2025-09-15 13:06:33 +08:00
service_api remove .value (#26633) 2025-10-11 09:08:29 +08:00
web Fix/token exp when exchange main (#26708) 2025-10-10 01:24:36 -07:00
__init__.py chore(api/controllers): Apply Ruff Formatter. (#7645) 2024-08-26 15:29:10 +08:00