Merge branch 'master' into analysis-layers

Conflicts: npm-shrinkwrap.json
2016-03-08 16:06:01 +01:00
parent 9d77aea6be 20609bc37e
commit d5fbcfcecb
21 changed files with 10 additions and 842 deletions
@@ -38,7 +38,7 @@
        "lru-cache": "2.6.5",
        "lzma": "~1.3.7",
        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-        "cartodb-query-tables": "https://github.com/CartoDB/node-cartodb-query-tables/tarball/master"
+        "cartodb-query-tables": "~0.1.0"
    },
    "devDependencies": {
        "istanbul": "~0.3.6",