Javier Goizueta 6d30903531 Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation ...

# Conflicts:
#	lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js

2017-12-13 12:53:20 +01:00

..

aggregation-map-config.js

Create a MapConfig's subclass to delegate aggregation

2017-12-13 11:42:51 +01:00

aggregation-query.js

Simplify Aggregation classes

2017-12-13 12:35:17 +01:00

aggregation.js

Simplify Aggregation classes

2017-12-13 12:35:17 +01:00