Merge branch 'master' into 257-remove-old-api

Conflicts:
	package.json
This commit is contained in:
Raul Ochoa
2015-02-20 15:24:13 +01:00
5 changed files with 15 additions and 8 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "1.28.5",
"version": "1.28.6",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"