Merge branch 'master' into new_querytables_library

2016-03-03 19:30:51 +01:00
parent df0597f12a 66aea5e10f
commit 94c7bc41be
6 changed files with 1019 additions and 489 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.25.3",
+    "version": "2.26.3",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -26,7 +26,7 @@
        "node-statsd": "~0.0.7",
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "1.11.1",
+        "windshaft": "1.13.2",
        "step": "~0.0.6",
        "queue-async": "~1.0.7",
        "request": "~2.62.0",