]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 30 Mar 2021 07:33:01 +0000 (09:33 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 30 Mar 2021 07:33:01 +0000 (09:33 +0200)
1  2 
CMakeLists.txt
lib-php/website/search.php

diff --cc CMakeLists.txt
Simple merge
Simple merge