Concedo 42ad89cd86 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/cann.Dockerfile # .devops/cpu.Dockerfile # .devops/llama-cli-cann.Dockerfile # .devops/nix/package.nix # .github/workflows/build-android.yml # .github/workflows/build-cann.yml # .github/workflows/build-msys.yml # .github/workflows/docker.yml # .github/workflows/editorconfig.yml # .github/workflows/gguf-publish.yml # .github/workflows/python-lint.yml # .github/workflows/release.yml # CMakeLists.txt # docs/backend/CANN.md # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/hmx-matmul-ops.c # ggml/src/ggml-hexagon/htp/htp-ctx.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-rpc/ggml-rpc.cpp # scripts/sync_vendor.py # tests/test-chat-auto-parser.cpp # tests/test-chat.cpp # tests/test-json-schema-to-grammar.cpp # tests/test-reasoning-budget.cpp # tools/cli/cli.cpp # tools/server/CMakeLists.txt # tools/server/README.md		2026-03-30 20:45:38 +08:00
..
CMakeLists.txt	vendor : update cpp-httplib to 0.35.0 (#19969)	2026-02-28 13:53:56 +01:00
httplib.cpp	vendor : update cpp-httplib to 0.40.0 (#21100)	2026-03-28 08:59:44 +01:00
httplib.h	vendor : update cpp-httplib to 0.40.0 (#21100)	2026-03-28 08:59:44 +01:00