]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 12 Dec 2012 17:55:03 +0000 (18:55 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 12 Dec 2012 17:55:03 +0000 (18:55 +0100)
commit7c56f24c1f83e9d19c9df723bb86335598add902
tree81fa9434b88b0e90178f2119a1becf655a437310
parentfb141e027a459e4e32d0ad71803ba2ac90d1d6f1
parentfa1f23edfbd0672ae430722152314ecc69615b56
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/init-website.php
lib/init-website.php
settings/settings.php
website/reverse.php
website/search.php