]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 29 Sep 2017 17:44:09 +0000 (19:44 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 29 Sep 2017 17:44:09 +0000 (19:44 +0200)
1  2 
lib/Geocode.php
lib/lib.php

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