Raul Ochoa 52dbe14af2 Merge branch 'master' into mapconfig-extension ... Conflicts: npm-shrinkwrap.json package.json		2015-10-13 16:06:04 +02:00
..
acceptance	Merge branch 'master' into mapconfig-extension	2015-10-13 16:06:04 +02:00
fixtures	Named map mapconfig provider takes care of template modifications	2015-09-23 16:45:20 +02:00
integration	Remove redis keys used in tests after each test	2015-09-25 14:08:35 +02:00
monkey	windshaft for cartodb	2011-09-05 00:00:41 +01:00
results/png	Empty results/png directory	2015-07-06 02:32:13 +02:00
support	rmdirRecursiveSync DRY	2015-09-25 19:56:28 +02:00
unit/cartodb	Remove app dependency from controllers	2015-09-30 18:00:54 +02:00