]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c2982a ef48ee5)
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 9 Mar 2015 20:40:17 +0000 (21:40 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 9 Mar 2015 20:40:17 +0000 (21:40 +0100)
1  2 
utils/setup.php patch | diff1 | diff2 | blob | history

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