Merge tag '1.13.0' into CDB-3686

This commit is contained in:
Raul Ochoa 2014-07-30 18:25:10 +02:00
commit 4e420c2f33

4
npm-shrinkwrap.json generated
View File

@ -938,8 +938,8 @@
"from": "git://github.com/CartoDB/node-cartodb-redis.git#0.5.0"
},
"redis-mpool": {
"version": "0.0.5",
"from": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.5",
"version": "0.0.4",
"from": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.4",
"dependencies": {
"generic-pool": {
"version": "2.0.4"