Daniel Hiltgen 00defa8f79 Merge remote-tracking branch 'upstream/main' into llama-runner-phase-0 ... # Conflicts: # envconfig/config.go # integration/context_test.go # integration/model_arch_test.go		2026-05-08 16:00:29 -07:00
..
config.go	Merge remote-tracking branch 'upstream/main' into llama-runner-phase-0	2026-05-08 16:00:29 -07:00
config_test.go	app: fix desktop app stuck loading when OLLAMA_HOST is an unspecified bind address (#14885)	2026-03-19 12:57:57 -04:00
test_home_test.go	add ability to disable cloud (#14221)	2026-02-12 15:47:00 -08:00