]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bcc40b d2a74c9)
Merge branch 'master' of github.com:twain47/Nominatim
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 13 Oct 2012 07:19:42 +0000 (09:19 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 13 Oct 2012 07:19:42 +0000 (09:19 +0200)
Conflicts:
munin/nominatim_importlag
utils/setup.php

1  2 
website/search.php patch | diff1 | diff2 | blob | history

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