]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 3 Feb 2021 09:40:13 +0000 (10:40 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 3 Feb 2021 09:40:13 +0000 (10:40 +0100)
1  2 
CMakeLists.txt
lib/admin/update.php

diff --cc CMakeLists.txt
Simple merge
Simple merge