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
..
cartodb	Merge branch 'master' into refactor-metadata	2018-05-23 12:12:36 +02:00