]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 3 May 2015 07:19:23 +0000 (09:19 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 3 May 2015 07:19:23 +0000 (09:19 +0200)
1  2 
lib/Geocode.php
settings/settings.php
website/search.php

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