Etienne Trimaille 5d6d904e69 Merge branch 'develop' into clipping ... Conflicts: .gitignore		2015-12-30 10:16:46 +01:00
..
Dockerfile	correct imposm3 version like : 0.1dev-20151229-901b40b	2015-12-29 18:29:08 +01:00
importer.py	clip with SQL function	2015-12-29 14:38:08 +01:00
requirements.txt	merge docker-osmupdate docker-imposm	2015-07-30 11:38:13 +02:00