Simon Martín a2bf235553 Merge branch 'master' into rateLimits		2018-03-02 21:21:10 +01:00
..
acceptance	Merge branch 'master' into rateLimits	2018-03-02 21:21:10 +01:00
fixtures	recreate test images with new font	2018-01-11 12:15:23 +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	add fallback for using metadata fallback	2018-02-14 17:31:05 +01:00
unit/cartodb	Merge branch 'master' into rateLimits	2018-03-02 21:21:10 +01:00