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
..
cartodb	Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation	2017-12-13 12:53:20 +01:00