Simon Martín 1bb716ef33 Merge branch 'master' into errorLogs		2017-12-12 16:15:30 +01:00
..
acceptance	Merge branch 'master' into errorLogs	2017-12-12 16:15:30 +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	Force png tile generation for static maps (#808)	2017-12-12 13:20:22 +01:00
unit/cartodb	update test file name	2017-11-30 15:04:38 +01:00