]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 31 Mar 2015 21:09:55 +0000 (23:09 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 31 Mar 2015 21:09:55 +0000 (23:09 +0200)
commit00379183adaca10dbbae1c3819e8652269d49ad7
treeb48365f7ae199337ec8bf7ead700cf26d881d04f
parent5dc4f08682c160e6b8c7f04ac3cf7ac3c6010938
parentddcb95ca39c041ce9079d3c75367f5f8bc28b503
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/functions.sql
lib/Geocode.php
lib/lib.php
sql/functions.sql