Merge branch 'master' into errorLogs

This commit is contained in:
Simon Martín 2017-12-12 10:59:07 +01:00
commit b035b5d384

View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "4.2.1", "version": "4.3.1",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"