]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Jul 2019 13:18:39 +0000 (15:18 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Jul 2019 13:18:39 +0000 (15:18 +0200)
1  2 
CMakeLists.txt
sql/functions.sql

diff --cc CMakeLists.txt
Simple merge
Simple merge