Merge branch 'custom-leaflet'

# Conflicts:
#	package.json
This commit is contained in:
James Lyne 2021-07-22 15:08:15 +01:00
commit 3d2ad01353
2 changed files with 3 additions and 4 deletions

5
package-lock.json generated
View File

@ -5805,9 +5805,8 @@
} }
}, },
"leaflet": { "leaflet": {
"version": "1.7.1", "version": "git+https://github.com/JLyne/leaflet.git#c809378bc0ba3764f0b5a4087f7b9748e2718717",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", "from": "git+https://github.com/JLyne/leaflet.git"
"integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
}, },
"levn": { "levn": {
"version": "0.4.1", "version": "0.4.1",

View File

@ -13,7 +13,7 @@
"dependencies": { "dependencies": {
"@kyvg/vue3-notification": "2.3.0", "@kyvg/vue3-notification": "2.3.0",
"@soerenmartius/vue3-clipboard": "^0.1", "@soerenmartius/vue3-clipboard": "^0.1",
"leaflet": "1.7.1", "leaflet": "^git+https://github.com/JLyne/leaflet.git",
"normalize-scss": "^7.0", "normalize-scss": "^7.0",
"vue": "^3.1", "vue": "^3.1",
"vuex": "^4.0" "vuex": "^4.0"