Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	yarn.lock
  • Loading branch information
davbauer committed Nov 12, 2023
2 parents f5f81ba + 67e301c commit 9f77aca
Show file tree
Hide file tree
Showing 3 changed files with 226 additions and 211 deletions.
1 change: 1 addition & 0 deletions .svelte-kit/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"include": [
"ambient.d.ts",
"./types/**/$types.d.ts",
"../vite.config.js",
"../vite.config.ts",
"../src/**/*.js",
"../src/**/*.ts",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.25.1",
"@types/node": "^20.8.0",
"@types/node": "^20.9.0",
"@types/ws": "^8.5.5",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"autoprefixer": "^10.4.14",
"axios": "^1.6.0",
"autoprefixer": "^10.4.16",
"axios": "^1.6.1",
"daisyui": "^3.9.4",
"eslint": "^8.52.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte": "^2.34.0",
"eslint-plugin-svelte": "^2.35.0",
"moment": "^2.29.4",
"postcss": "^8.4.31",
"prettier": "^2.8.0",
Expand Down
Loading

0 comments on commit 9f77aca

Please sign in to comment.