Merge branch 'main' into vue3

# Conflicts: # src/components/tasks/mixins/createTask.js
2021-10-17 13:37:20 +02:00 · 2021-10-17 13:37:20 +02:00 · 1d2abf56f9
commit 1d2abf56f9
parent 6f51921588 e52c139c9f
9 changed files with 211 additions and 138 deletions
--- a/package.json
+++ b/package.json
@ -60,7 +60,7 @@
    "browserslist": "4.17.4",
    "cypress": "8.6.0",
    "cypress-file-upload": "5.0.8",
-    "esbuild": "0.13.7",
+    "esbuild": "0.13.8",
    "eslint": "8.0.1",
    "eslint-plugin-vue": "7.19.1",
    "express": "4.17.1",