Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

# Conflicts:
#	frontend/yarn.lock
This commit is contained in:
James Cole
2021-07-05 20:02:07 +02:00
3 changed files with 10 additions and 201 deletions

View File

@@ -20,7 +20,7 @@
"sass": "^1.32.8",
"sass-loader": "^12.0.0",
"vue-i18n": "^8.24.2",
"vue-loader": "^15.9.5",
"vue-loader": "^16.3.0",
"vue-template-compiler": "^2.6.12",
"vuex": "^3.6.2",
"webpack": "^5.40.0"
@@ -38,7 +38,7 @@
"localforage": "^1.9.0",
"localforage-memoryStorageDriver": "^0.9.2",
"overlayscrollbars": "^1.13.1",
"sortablejs": "^1.13.0",
"sortablejs": "^1.14.0",
"v-calendar": "^2.3.0",
"vue-typeahead-bootstrap": "^2.8.0",
"vue2-leaflet": "^2.7.1"