Merge branch 'master' into static-controllers

Conflicts: npm-shrinkwrap.json
2014-12-02 18:24:41 +01:00
parent 21179c56d4 56e4cb765f
commit d628b2de27
4 changed files with 11 additions and 5 deletions
@@ -32,7 +32,7 @@
        "cartodb-psql": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
        "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.3.0",
        "lzma": "~1.3.7",
-        "log4js": "~0.6.17",
+        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
        "rollbar": "~0.3.13"
    },
    "devDependencies": {