Update to master branch

This commit is contained in:
Daniel García Aubert 2019-07-23 11:14:40 +02:00
parent d7a439477c
commit 1a9b410540
2 changed files with 3 additions and 3 deletions

4
package-lock.json generated
View File

@ -4040,8 +4040,8 @@
"integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
}, },
"windshaft": { "windshaft": {
"version": "github:cartodb/windshaft#101e3a5093c834262381fad768a37b0a1e24de4a", "version": "github:cartodb/windshaft#83a3d1cbc0456f124bda29ce1b18fce9d59c7d81",
"from": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion", "from": "github:cartodb/windshaft#master",
"requires": { "requires": {
"@carto/cartonik": "^0.6.1", "@carto/cartonik": "^0.6.1",
"@carto/mapnik": "3.6.2-carto.16", "@carto/mapnik": "3.6.2-carto.16",

View File

@ -49,7 +49,7 @@
"step-profiler": "0.3.0", "step-profiler": "0.3.0",
"turbo-carto": "0.21.2", "turbo-carto": "0.21.2",
"underscore": "1.6.0", "underscore": "1.6.0",
"windshaft": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion", "windshaft": "github:cartodb/windshaft#master",
"yargs": "11.1.0" "yargs": "11.1.0"
}, },
"devDependencies": { "devDependencies": {