cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into static-controllers

Browse Source 
Conflicts:
	npm-shrinkwrap.json
	package.json
This commit is contained in:
Raul Ochoa
2014-12-16 19:05:39 +01:00
parent a5f908d70e 72cf5f8b04
commit f84b907dc8
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "1.21.2",
"version": "1.21.3",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"