local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into vue3

Browse source 
# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
kolaente 2021-10-17 17:32:50 +02:00
commit 49cd66581d
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

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

8
yarn.lock
View file

@ -3913,10 +3913,10 @@ has@^1.0.3:
dependencies: dependencies:
function-bind "^1.1.1" function-bind "^1.1.1"
highlight.js@11.2.0: highlight.js@11.3.0:
version "11.2.0" version "11.3.0"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.2.0.tgz#a7e3b8c1fdc4f0538b93b2dc2ddd53a40c6ab0f0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.3.0.tgz#6990f1a9d42edb4c9b1df955b74aebb877b9f364"
integrity sha512-JOySjtOEcyG8s4MLR2MNbLUyaXqUunmSnL2kdV/KuGJOmHZuAR5xC54Ko7goAXBWNhf09Vy3B+U7vR62UZ/0iw== integrity sha512-4NRoSbc7W4m7bZWsiE7JMBkGSKj/b1UI/acG2EigsQ3KHXyYfWPjdTUefNJuqbAtS13/r+pAWmXWHaGJVuWn2A==
hosted-git-info@^2.1.4: hosted-git-info@^2.1.4:
version "2.8.9" version "2.8.9"