Merge branch 'master' into mapconfig-extension

Conflicts: npm-shrinkwrap.json package.json
2015-11-02 11:13:34 +01:00
parent 2c4cb6d42e 5844c031c9
commit 663703abae
3 changed files with 35 additions and 27 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.17.1",
+    "version": "2.18.1",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"