]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15266a9 589bad8)
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 10 Apr 2014 21:05:23 +0000 (23:05 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 10 Apr 2014 21:05:23 +0000 (23:05 +0200)
Conflicts:
sql/functions.sql

1  2 
sql/functions.sql patch | diff1 | diff2 | blob | history

diff --cc sql/functions.sql
Simple merge
Open Source search based on OpenStreetMap data