]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 17 Dec 2012 22:07:03 +0000 (23:07 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 17 Dec 2012 22:07:03 +0000 (23:07 +0100)
commitd76eca32f4c96f5725877aec555c7352a8452ba2
tree31c0b8cdc89fc62bd93539041cefbaea4b0503c8
parent7e26dcb4772ff6c827177e445c672364d47bcae7
parentc2d5303192c960b456b2d2ab4b6e14cead2042ac
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/init-website.php
settings/settings.php
lib/init-website.php
settings/settings.php
sql/partitions.src.sql
website/reverse.php