]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce112f7 f07d620)
Merge remote-tracking branch 'markus/master' into master
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 14 May 2016 19:09:57 +0000 (21:09 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 14 May 2016 19:09:57 +0000 (21:09 +0200)
1  2 
utils/setup.php patch | diff1 | diff2 | blob | history

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