]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 2 Oct 2016 12:23:11 +0000 (14:23 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 2 Oct 2016 12:23:11 +0000 (14:23 +0200)
1  2 
lib/Geocode.php
tests/features/api/search_params.feature

diff --cc lib/Geocode.php
Simple merge