merge master

This commit is contained in:
Eneko Lakasta
2018-03-12 11:52:38 +01:00
parent f9cbb3aac8
commit 5ad1e1b645
28 changed files with 724 additions and 610 deletions
+1 -1
View File
@@ -48,7 +48,7 @@
"step-profiler": "~0.3.0",
"turbo-carto": "0.20.2",
"underscore": "~1.6.0",
"windshaft": "4.5.3",
"windshaft": "4.5.4",
"yargs": "~5.0.0"
},
"devDependencies": {