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
..
api	Merge branch 'master' into overviews-widgets-2	2016-05-18 13:58:55 +02:00
backends	Move definition to the scope where it's needed	2016-05-18 18:21:17 +02:00
cache	Fix named maps with analysis	2016-05-13 16:57:27 +02:00
controllers	Adds support for sql wrap in all layers	2016-05-19 13:34:29 +02:00
middleware	User extraction from request middleware	2015-09-30 17:17:01 +02:00
models	Adds support for sql wrap in all layers	2016-05-19 13:34:29 +02:00
monitoring	Health check will always return error if file is found even if empty	2015-09-22 15:15:57 +02:00
stats	Add timer helper	2016-03-18 17:21:43 +01:00
utils	Merge branch 'master' into turbo-carto-category	2016-05-19 16:58:31 +02:00
server_options.js	Add option to modify host header template for camshaft batch client	2016-04-20 16:36:29 +02:00
server.js	Merge branch 'master' into overviews-widgets-2	2016-05-18 13:58:55 +02:00