Simon Martín 04e00bb834 Merge branch 'master' into fix-image-format-png		2018-05-16 14:40:59 +02:00
..
map	Merge branch 'master' into fix-image-format-png	2018-05-16 14:40:59 +02:00
middlewares	Merge branch 'master' into fix-image-format-png	2018-05-16 14:40:59 +02:00
template	Merge pull request #954 from CartoDB/controllers-goodies	2018-05-14 18:31:48 +02:00
api-router.js	In order to extract common middlewares between routers and controlles we need to activate mergeParams options to preserve the req.params from the parent router	2018-05-14 11:50:48 +02:00