Merge branch 'master' into mapconfig-extension

Conflicts: npm-shrinkwrap.json package.json
2015-10-28 19:41:44 +01:00
parent e5afdb1e04 a20a1f692b
commit 3b9759d5e4
3 changed files with 28 additions and 20 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.16.1",
+    "version": "2.17.1",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"