Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Simon Brooke 2020-02-27 11:05:08 +00:00
commit 2336e9dc2a
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
5 changed files with 18 additions and 15 deletions

View file

@ -38,11 +38,13 @@
:scripts {}
:styles {}}
:geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv"
:scripts {:core {:local "vendor/node_modules/geocsv-js/js/geocsv.js"}
:scripts {:core {:local "vendor/node_modules/@simon_brooke/geocsv/js/geocsv.js"}
:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js"
:remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"}
:papaparse {:local "vendor/node_modules/papaparse/papaparse.js"
:remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"}}
:remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"}
:showdown {:local "vendor/node_modules/showdown/bin/showdown.js"
:remote "https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"}}
:styles {:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.css"
:remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"}}
:icon-url-base "map-pin/"}