]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 26 Jun 2020 19:37:01 +0000 (21:37 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 26 Jun 2020 19:37:01 +0000 (21:37 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge