Merge branch 'master' into new_querytables_library

Conflicts: test/support/prepare_db.sh test/support/sql/CDB_QueryStatements.sql
2016-03-04 00:39:14 +01:00
parent 94c7bc41be 3979cda8c2
commit 16a7c4fa3d
8 changed files with 144 additions and 135 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.26.3",
+    "version": "2.26.4",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"