Merge remote-tracking branch 'origin/master' into cartocss-meta

2016-09-28 17:06:36 +02:00
parent b76098ba45 260e321537
commit 2a4ae88bc0
10 changed files with 291 additions and 88 deletions
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.77.0",
+  "version": "2.78.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.43.0",
+    "camshaft": "0.44.1",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "0.13.1",