Skip to content

Commit

Permalink
Merge branch 'master' into openmfp
Browse files Browse the repository at this point in the history
* master:
  Update dependency @vitejs/plugin-vue to v5.1.1 (#2011)
  Update vitest monorepo to v2.0.5 (#2013)
  Update dependency pinia to v2.2.0 (#2010)
  Update dependency vuetify to v3.6.14 (#2015)
  Update dependency vite to v5.3.5 (#2007)
  Update dependency @pinia/testing to v0.1.4 (#2009)
  Update dependency vue-router to v4.4.2 (#2016)
  Update dependency vue to v3.4.35 (#2006)
  Fixes bug with project create and pins sass to 1.74.1 (#2012)

# Conflicts:
#	backend/lib/services/projects.js
#	frontend/package.json
#	yarn.lock
  • Loading branch information
holgerkoser committed Aug 1, 2024
2 parents a292223 + 219bf05 commit a3a9071
Show file tree
Hide file tree
Showing 32 changed files with 481 additions and 309 deletions.
467 changes: 280 additions & 187 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"eslint-plugin-vue": "^9.23.0",
"jsdom": "^24.0.0",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "1.74.1",
"sass": "~1.74.1",
"unplugin-fonts": "^1.1.1",
"vite": "^5.1.6",
"vite-plugin-compression": "^0.5.1",
Expand Down
Loading

0 comments on commit a3a9071

Please sign in to comment.