Merge branch 'main' into feat/cancel-model-download

# Conflicts: # src/lib/components/chat/Settings/Models.svelte

Merge branch 'main' into feat/cancel-model-download
# Conflicts: # src/lib/components/chat/Settings/Models.svelte
45311bfa · Anuraag Jain · ae97a963 · 2fa94956 · 45311bfa · 45311bfa
Commit 45311bfa authored Mar 23, 2024 by Anuraag Jain
9 changed files
--- a/src/routes/(app)/prompts/create/+page.svelte
+++ b/src/routes/(app)/prompts/create/+page.svelte
--- a/src/routes/(app)/prompts/edit/+page.svelte
+++ b/src/routes/(app)/prompts/edit/+page.svelte
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
--- a/src/routes/auth/+page.svelte
+++ b/src/routes/auth/+page.svelte
--- a/src/routes/error/+page.svelte
+++ b/src/routes/error/+page.svelte
--- a/src/tailwind.css
+++ b/src/tailwind.css
--- a/test.json
+++ b/test.json
--- a/update_ollama_models.sh
+++ b/update_ollama_models.sh
--- a/vite.config.ts
+++ b/vite.config.ts