Daniel García Aubert 07b4cb78b1 Merge branch 'master' into mapconfig-aggregation		2017-12-14 18:19:54 +01:00
..
acceptance	Merge branch 'master' into mapconfig-aggregation	2017-12-14 18:19:54 +01:00
fixtures	Force png tile generation for static maps (#808)	2017-12-12 13:20:22 +01:00
integration	Fix assertions, now MapCofig.getLayer() return {} if layer not found	2017-03-17 11:06:40 +00:00
monkey	windshaft for cartodb	2011-09-05 00:00:41 +01:00
results	Force png tile generation for static maps (#808)	2017-12-12 13:20:22 +01:00
support	Fix issue when sql_wrap is provided and aggregation metadata query fails	2017-12-13 16:34:36 +01:00
unit/cartodb	update test file name	2017-11-30 15:04:38 +01:00