Merge branch 'master' into standalone-server

Conflicts: lib/cartodb/controllers/named_static_maps.js
2015-09-21 23:55:17 +02:00
parent 16480a6c44 619545b993
commit 6cf4d53b7c
3 changed files with 10 additions and 3 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.12.1",
+    "version": "2.13.1",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"