Raul Ochoa 81200b72b4 Merge branch 'master' into overviews-work ...

Conflicts:
	test/acceptance/multilayer.js

2016-01-28 19:48:11 +01:00

..

acceptance

Merge branch 'master' into overviews-work

2016-01-28 19:48:11 +01:00

fixtures

Named map mapconfig provider takes care of template modifications

2015-09-23 16:45:20 +02:00

integration

Emulate new overview table naming schme in the tests

2016-01-26 15:08:55 +01: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

Merge branch 'master' into overviews-work

2016-01-28 19:48:11 +01:00

unit/cartodb

Remove trailing whitespace

2016-01-28 19:44:25 +01:00