Merge branch 'main' into vue3

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
kolaente 2021-10-17 17:32:50 +02:00
commit 49cd66581d
Signed by untrusted user who does not match committer: konrad
GPG key ID: F40E70337AB24C9B
2 changed files with 5 additions and 5 deletions

View file

@ -26,7 +26,7 @@
"dompurify": "2.3.3",
"easymde": "^2.15.0",
"flatpickr": "^4.6.9",
"highlight.js": "11.2.0",
"highlight.js": "11.3.0",
"is-touch-device": "1.0.1",
"lodash.clonedeep": "^4.5.0",
"lodash.debounce": "^4.0.8",