Concedo f430916a71 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # docs/backend/CANN.md # docs/multimodal/minicpmo2.6.md # docs/multimodal/minicpmv2.5.md # docs/multimodal/minicpmv2.6.md # examples/speculative-simple/speculative-simple.cpp # ggml/cmake/ggml-config.cmake.in # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cpu/repack.cpp # ggml/src/ggml-opencl/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-opencl/kernels/add.cl # ggml/src/ggml-opencl/kernels/mul.cl # scripts/compare-commits.sh # scripts/compare-llama-bench.py # scripts/sync-ggml.last # tools/server/README.md		2025-08-02 10:25:10 +08:00
..
bench	Merge branch 'upstream' into concedo_experimental	2025-05-03 12:15:36 +08:00
public	server : fix appearance of the chats list context menu for Safari (#14322)	2025-06-29 19:29:57 +02:00
public_legacy
public_simplechat	Merge branch 'upstream' into concedo_experimental	2025-05-03 12:15:36 +08:00
tests	Merge branch 'upstream' into concedo_experimental	2025-08-02 10:25:10 +08:00
themes	Merge branch 'upstream' into concedo_experimental	2025-05-03 12:15:36 +08:00
webui	server : fix appearance of the chats list context menu for Safari (#14322)	2025-06-29 19:29:57 +02:00
chat-llama2.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
chat.mjs
chat.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
server.cpp	server : implement universal assisted decoding (#12635)	2025-07-31 14:25:23 +02:00
utils.hpp	scripts: benchmark for HTTP server throughput (#14668)	2025-07-14 13:14:30 +02:00