]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 4 Oct 2016 18:34:34 +0000 (20:34 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 4 Oct 2016 18:34:34 +0000 (20:34 +0200)
1  2 
lib/Geocode.php
sql/functions.sql
tests/features/api/regression.feature

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