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

Conflicts:
	lib/cartodb/cartodb_windshaft.js

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

..

sql

Merge branch 'master' into standalone-server

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

assert.js

Standalone server initial implementation

2015-07-04 20:41:22 +02:00

config.js

Read test redis port configuration from test.js env

2013-12-17 17:17:11 +01:00

prepare_db.sh

Re-enable render limits

2015-07-10 19:10:55 +02:00

test_helper.js

Tests for surrogate keys in layergroup anonymous instantiation

2015-07-13 16:54:08 +02:00