]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 3 Nov 2020 15:29:19 +0000 (16:29 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 3 Nov 2020 15:29:19 +0000 (16:29 +0100)
1  2 
CMakeLists.txt
lib/Geocode.php
utils/update.php

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