]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'origin/master' into osmline
authorMarkus Gail <markus.gail.94@gmail.com>
Mon, 25 Apr 2016 09:01:04 +0000 (11:01 +0200)
committerMarkus Gail <markus.gail.94@gmail.com>
Mon, 25 Apr 2016 09:01:04 +0000 (11:01 +0200)
Conflicts:
lib/Geocode.php
lib/PlaceLookup.php
sql/functions.sql
sql/tables.sql
utils/setup.php


No differences found