Raul Ochoa f96c80d7a1 Merge branch 'master' into standalone-server ...

Conflicts:
	lib/cartodb/cartodb_windshaft.js

2015-09-08 15:42:30 +02:00

..

acceptance

Merge branch 'master' into standalone-server

2015-09-08 15:42:30 +02:00

fixtures

Ports acceptance tests from windshaft

2015-07-07 23:46:58 +02:00

integration

Moves template maps to backends directory

2015-06-29 16:38:13 +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

Merge branch 'master' into standalone-server

2015-09-08 15:42:30 +02:00

unit/cartodb

More strict cyclomatic complexity check

2015-07-15 15:10:59 +02:00

benchmark.js

Make benchmarker executable

2012-07-25 18:29:43 +02:00