Merge branch 'stable' into develop

This commit is contained in:
Georg Krause 2022-03-18 13:43:00 +01:00
commit f81221ef11
No known key found for this signature in database
GPG key ID: 2970D504B2183D22
14 changed files with 438 additions and 442 deletions

View file

@ -59,6 +59,9 @@
"vite-plugin-vue2": "1.9.3",
"vue-template-compiler": "2.6.14"
},
"resolutions": {
"vue-plyr/plyr": "3.6.2"
},
"eslintConfig": {
"root": true,
"env": {