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

diff --cc CMakeLists.txt
Simple merge
Simple merge