]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 29 Aug 2015 11:16:32 +0000 (13:16 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 29 Aug 2015 11:16:32 +0000 (13:16 +0200)
commit5b767a2cc8cbec9df0743d8bb959456fa24a2380
tree0ae0a268427f770894468b85108eda8f312e19ab
parentf6b5565db6ed86f353c483f4f5b61a3abaa497d9
parentfe3eb40e3a8c6721fc2438d6b9484753ac79753a
Merge remote-tracking branch 'upstream/master'

Conflicts:
utils/setup.php
utils/setup.php
utils/update.php