]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 21 May 2018 10:01:56 +0000 (12:01 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 21 May 2018 10:01:56 +0000 (12:01 +0200)
1  2 
lib/Geocode.php
lib/lib.php

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