Concedo 7304640f72 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # docs/android.md # docs/backend/hexagon/CMakeUserPresets.json # examples/llama.android/app/src/main/res/layout/activity_main.xml # examples/llama.android/app/src/main/res/layout/item_message_assistant.xml # examples/llama.android/app/src/main/res/layout/item_message_user.xml # examples/model-conversion/scripts/causal/run-org-model.py # examples/model-conversion/scripts/utils/common.py # ggml/CMakeLists.txt # ggml/src/ggml-hexagon/CMakeLists.txt # ggml/src/ggml-hexagon/htp/CMakeLists.txt # ggml/src/ggml-hexagon/htp/matmul-ops.c # tests/test-arg-parser.cpp # tools/server/README.md		2025-12-20 09:32:06 +08:00
..
bench
public	webui: Add editing attachments in user messages (#18147)	2025-12-19 11:14:07 +01:00
public_legacy	common : fix json schema with '\' in literals (#17307)	2025-11-29 17:06:32 +01:00
public_simplechat
tests	Merge commit '4aced7a631' into concedo_experimental	2025-12-16 23:14:12 +08:00
themes
webui	Merge branch 'upstream' into concedo_experimental	2025-12-20 09:32:06 +08:00
chat-llama2.sh
chat.mjs
chat.sh
README-dev.md	server: delegate result_state creation to server_task (#17835)	2025-12-08 17:04:38 +01:00
server-common.cpp	common : add parser for ministral/mistral large 3/devstral 2 (#17713)	2025-12-09 17:31:04 -06:00
server-common.h	server: improve speed of speculative decoding (#17808)	2025-12-08 14:35:28 +01:00
server-context.cpp	server: friendlier error msg when ctx < input (#18174)	2025-12-19 12:10:00 +01:00
server-context.h	cli: new CLI experience (#17824)	2025-12-10 15:28:59 +01:00
server-http.cpp
server-http.h
server-models.cpp	presets: refactor, allow cascade presets from different sources, add global section (#18169)	2025-12-19 12:08:20 +01:00
server-models.h	presets: refactor, allow cascade presets from different sources, add global section (#18169)	2025-12-19 12:08:20 +01:00
server-queue.cpp	server: delegate result_state creation to server_task (#17835)	2025-12-08 17:04:38 +01:00
server-queue.h	cli: new CLI experience (#17824)	2025-12-10 15:28:59 +01:00
server-task.cpp	server : make cache_reuse configurable per request (#17858)	2025-12-08 12:43:12 +02:00
server-task.h	cli: new CLI experience (#17824)	2025-12-10 15:28:59 +01:00
server.cpp	server: (webui) add --webui-config (#18028)	2025-12-17 21:45:45 +01:00