Raul Ochoa b308259e6f Merge branch 'master' into turbo-carto-category ...

Conflicts:
	lib/cartodb/utils/style/postgres-datasource.js

2016-05-19 16:58:31 +02:00

..

postgres-datasource.js

Merge branch 'master' into turbo-carto-category

2016-05-19 16:58:31 +02:00

turbo-carto-adapter.js

Adds support for mapnik substitution token at turbo-carto level

2016-05-17 15:00:18 +02:00

turbo-carto-parser.js

Starts using turbo-carto dependency

2016-04-26 16:28:05 +02:00