]> git.openstreetmap.org Git - nominatim.git/commit
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)
commitb03be15442502aa2e52bacff70fb983cf4397d70
tree5b57de4f72ce56ddcf8597d2d57cecf7785a0b7d
parent7879ad44cd1e36ae1235c3dcdfd9e477491813e4
parent131527bdab6738baff679171c421ea7fa863e100
Merge remote-tracking branch 'origin/master' into osmline

Conflicts:
lib/Geocode.php
lib/PlaceLookup.php
sql/functions.sql
sql/tables.sql
utils/setup.php
lib/Geocode.php
lib/PlaceLookup.php
lib/ReverseGeocode.php
sql/functions.sql
sql/tables.sql
tests/steps/terrain.py
utils/setup.php