Lukas Martinelli cb550a7e1a Merge branch 'master' into waterway ...

Conflicts:
	layers/waterway/README.md

2016-11-29 14:58:46 +00:00

..

mapping.yaml

More nuanced waterway

2016-11-15 19:37:19 +01:00

merge_waterway.sql

More nuanced waterway

2016-11-15 19:37:19 +01:00

waterway.sql

Ensure empty name is NULL in waterway

2016-11-29 13:33:33 +00:00

waterway.yaml

More nuanced waterway

2016-11-15 19:37:19 +01:00