]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 5 Jul 2021 14:20:44 +0000 (16:20 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 5 Jul 2021 14:20:44 +0000 (16:20 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge