]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 5 Jun 2017 18:27:32 +0000 (20:27 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 5 Jun 2017 18:27:32 +0000 (20:27 +0200)
1  2 
lib/Geocode.php
sql/functions.sql

diff --cc lib/Geocode.php
Simple merge
Simple merge