]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 19 Dec 2014 19:20:35 +0000 (20:20 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 19 Dec 2014 19:22:00 +0000 (20:22 +0100)
commitc68a8c9f2d4898bbc0fa5a13200b888093c0e808
tree5fd912c9c49348a3280aad2e5b7f326b668f793d
parent9c1abc4b75b941f434d6a120bd1c8fc4f1031c30
parentc391479c5852f165c4be85b6e39d1290ae2d4a58
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/indices.src.sql
sql/partition-tables.src.sql
sql/tables.sql
utils/setup.php
settings/settings.php
sql/functions.sql
sql/tables.sql
utils/setup.php