Merge branch 'master' into analysis-layers

Conflicts: npm-shrinkwrap.json test/support/test-client.js
2016-03-14 15:13:19 +01:00
parent 3f41f19ab9 be61d41f5e
commit eec44dd62d
21 changed files with 1175 additions and 550 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.27.0",
+    "version": "2.28.1",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -38,7 +38,8 @@
        "lru-cache": "2.6.5",
        "lzma": "~1.3.7",
        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-        "cartodb-query-tables": "~0.1.0"
+        "cartodb-query-tables": "~0.1.0",
+        "turbo-cartocss": "0.4.0"
    },
    "devDependencies": {
        "istanbul": "~0.3.6",