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

..

empty-layer-stats.js

PR changes

2017-05-18 11:51:12 +02:00

factory.js

Get back layer-stats from windshaft-stats

2017-05-17 20:16:43 +02:00

layer-stats.js

PR changes

2017-05-18 11:51:12 +02:00

mapnik-layer-stats.js

Merge branch 'master' into refactor-metadata

2018-05-23 12:12:36 +02:00

torque-layer-stats.js

Get back layer-stats from windshaft-stats

2017-05-17 20:16:43 +02:00