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

Conflicts:
	lib/cartodb/cartodb_windshaft.js

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

..

ported

Ports acceptance tests from windshaft

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

CDB_QueryStatements.sql

Add querytables and cdb_tablemetadata for proper testing its integration

2015-02-05 17:21:38 +01:00

CDB_QueryTables.sql

Upgrade CDB_QueryTables to use latest version

2015-09-07 17:17:40 +02:00

gadm4.sql

Add support for specifying database connection passwords

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

windshaft.test.sql

Ports acceptance tests from windshaft

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