]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Dec 2012 23:26:48 +0000 (00:26 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Dec 2012 23:26:48 +0000 (00:26 +0100)
commitfb141e027a459e4e32d0ad71803ba2ac90d1d6f1
treebfcd4a80c41282a97922223526573dd2b3dbc547
parentb19e1907624f6ad06252b4a385598f73d743ed36
parentbde251f2a244b87334528f0b01281f8bd96d1ebf
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/tables.sql
utils/setup.php
website/search.php
settings/settings.php
sql/tables.sql
utils/setup.php
website/search.php