]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
commitf1c4615c32532cdb03845c017f660fa5c5a06331
tree36093a1b8620de3736761d07cc059f1d4580cb9a
parentc68a8c9f2d4898bbc0fa5a13200b888093c0e808
parent3db64e79136a486533730d23ef4fe854b0ec85fa
Merge remote-tracking branch 'upstream/master'

Conflicts:
utils/specialphrases.php
lib/lib.php
settings/settings.php