]> git.openstreetmap.org Git - nominatim.git/commit
Merge branch 'tigerlines' of /home/markus/Nominatim into tiger
authorMarkus Gail <markus.gail.94@gmail.com>
Mon, 21 Mar 2016 13:26:39 +0000 (14:26 +0100)
committerMarkus Gail <markus.gail.94@gmail.com>
Tue, 22 Mar 2016 10:26:39 +0000 (11:26 +0100)
commita4ecd9d73e93a56aeee336c7fa7e18aa42bd9e03
tree43c961ca7a5a88a9d671c1ee4599d523de0fb4a1
parente94b667e16177916dc34d790df475a69fe01a7d9
parentd8703c223b50f87a6adb779311f651853e6d4e36
Merge branch 'tigerlines' of /home/markus/Nominatim into tiger

Conflicts:
lib/Geocode.php
lib/ReverseGeocode.php
lib/lib.php
lib/Geocode.php
lib/PlaceLookup.php
lib/ReverseGeocode.php
settings/settings.php
tests-php/Nominatim/NominatimTest.php