Merge branch 'geojson-renderer' of github.com:CartoDB/Windshaft-cartodb into geojson-renderer

This commit is contained in:
Daniel García Aubert 2016-01-29 15:36:47 +01:00
commit feef31d1bf
2 changed files with 4 additions and 4 deletions

6
npm-shrinkwrap.json generated
View File

@ -878,9 +878,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.7.0",
"from": "windshaft@1.7.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.7.0.tgz",
"version": "1.6.2",
"from": "https://github.com/CartoDB/Windshaft/tarball/geojson-renderer",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/geojson-renderer",
"dependencies": {
"mapnik": {
"version": "1.4.15-cdb6",

View File

@ -29,7 +29,7 @@
"node-statsd": "~0.0.7",
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "1.7.0",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/geojson-renderer",
"step": "~0.0.6",
"queue-async": "~1.0.7",
"request": "~2.62.0",