Simon Martín 37f6ac0c87 Merge branch 'master' into tilejson-url-apikey		2018-06-26 10:23:09 +02:00
..
acceptance	Merge branch 'master' into tilejson-url-apikey	2018-06-26 10:23:09 +02:00
fixtures	Tests for dates_as_numbers with tokens	2018-06-18 13:14:17 +02:00
integration	Rename overviews metadata api by overviews metadata backend	2018-04-09 19:47:43 +02: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	Merge pull request #976 from Algunenano/auto_postgis	2018-06-12 10:09:40 +02:00
unit/cartodb	Merge branch 'separate-routers' into improve-folder-structure	2018-04-17 16:07:47 +02:00