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

Conflicts:
	test/acceptance/multilayer.js

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

..

sql

Remove trailing whitespace

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

assert.js

Adds methods to assert mapnik images

2015-09-23 13:04:08 +02:00

config.js

Remove trailing whitespace

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

prepare_db.sh

Merge branch 'master' into overviews-work

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

test_helper.js

rmdirRecursiveSync DRY

2015-09-25 19:56:28 +02:00