Javier Goizueta c1feaecbcb Merge branch 'master' into refactor-metadata ... # Conflicts: # lib/cartodb/backends/layer-stats/mapnik-layer-stats.js		2018-05-23 12:12:36 +02:00
..
api	Merge branch 'master' into fix-image-format-png	2018-05-16 14:40:59 +02:00
backends	Merge branch 'master' into refactor-metadata	2018-05-23 12:12:36 +02:00
cache	Rename user limits api by user limits backend	2018-04-10 10:16:07 +02:00
models	Merge branch 'master' into metadata	2018-05-18 20:49:26 +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	Fix bug	2018-05-21 14:05:27 +02:00
server_options.js	Use routes configuration to create and mount routes and controllers	2018-05-09 14:59:21 +02:00
server-info-controller.js	Meet application logic and folder struture	2018-04-09 16:18:30 +02:00
server.js	Meet application logic and folder struture	2018-04-09 16:18:30 +02:00