]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 1 Jun 2017 19:51:38 +0000 (21:51 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 1 Jun 2017 19:51:38 +0000 (21:51 +0200)
1  2 
lib/lib.php
sql/functions.sql

diff --cc lib/lib.php
Simple merge
Simple merge