cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mapconfig-extension

Browse Source 
Conflicts:
	npm-shrinkwrap.json
This commit is contained in:
Raul Ochoa
2016-01-18 14:32:33 +01:00
parent 30e479094f b5b881e662
commit fbc1bccb48
1 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
npm-shrinkwrap.json
Generated
+63 -12
View File
@@ -192,7 +192,7 @@
"dependencies": {
"mime-types": {
"version": "2.1.9",
"from": "mime-types@~2.1.8",
"from": "mime-types@~2.1.6",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"dependencies": {
"mime-db": {
@@ -272,9 +272,9 @@
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"
},
"methods": {
"version": "1.1.1",
"version": "1.1.2",
"from": "methods@~1.1.1",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz"
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
},
"on-finished": {
"version": "2.3.0",
@@ -289,9 +289,9 @@
}
},
"parseurl": {
"version": "1.3.0",
"version": "1.3.1",
"from": "parseurl@~1.3.0",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"
},
"path-to-regexp": {
"version": "0.1.7",
@@ -365,9 +365,60 @@
}
},
"serve-static": {
"version": "1.10.0",
"version": "1.10.1",
"from": "serve-static@~1.10.0",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz"
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.1.tgz",
"dependencies": {
"escape-html": {
"version": "1.0.3",
"from": "escape-html@~1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
},
"send": {
"version": "0.13.1",
"from": "send@0.13.1",
"resolved": "https://registry.npmjs.org/send/-/send-0.13.1.tgz",
"dependencies": {
"depd": {
"version": "1.1.0",
"from": "depd@~1.1.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
},
"destroy": {
"version": "1.0.4",
"from": "destroy@~1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
},
"http-errors": {
"version": "1.3.1",
"from": "http-errors@~1.3.1",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"mime": {
"version": "1.3.4",
"from": "mime@1.3.4",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
},
"ms": {
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
},
"statuses": {
"version": "1.2.1",
"from": "statuses@~1.2.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
}
}
}
}
},
"type-is": {
"version": "1.6.10",
@@ -381,7 +432,7 @@
},
"mime-types": {
"version": "2.1.9",
"from": "mime-types@~2.1.8",
"from": "mime-types@~2.1.6",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"dependencies": {
"mime-db": {
@@ -441,7 +492,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@@ -594,7 +645,7 @@
},
"mime-types": {
"version": "2.1.9",
"from": "mime-types@~2.1.2",
"from": "mime-types@~2.1.8",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"dependencies": {
"mime-db": {
@@ -774,9 +825,9 @@
}
},
"is-my-json-valid": {
"version": "2.12.3",
"version": "2.12.4",
"from": "is-my-json-valid@^2.12.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz",
"dependencies": {
"generate-function": {
"version": "2.0.0",