]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86b95a9 7ed580f)
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 27 Feb 2015 19:02:23 +0000 (20:02 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 27 Feb 2015 19:02:23 +0000 (20:02 +0100)
1  2 
settings/settings.php patch | diff1 | diff2 | blob | history

diff --cc settings/settings.php
Simple merge
Open Source search based on OpenStreetMap data