]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 28 Oct 2019 21:19:44 +0000 (22:19 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 28 Oct 2019 21:19:44 +0000 (22:19 +0100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge