Raul Ochoa eec44dd62d Merge branch 'master' into analysis-layers ...

Conflicts:
	npm-shrinkwrap.json
	test/support/test-client.js

2016-03-14 15:13:19 +01:00

..

acceptance

Merge branch 'master' into analysis-layers

2016-03-14 15:13:19 +01:00

fixtures

Moved turbo-cartocss integration from named maps admin to named map provider

2016-03-11 18:28:14 +01:00

integration

Rename suite

2016-03-03 19:29:42 +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 analysis-layers

2016-03-14 15:13:19 +01:00

unit/cartodb

Change form of overviews queries so they can be optimized

2016-03-02 19:25:08 +01:00