]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 11 Aug 2015 21:19:51 +0000 (23:19 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 11 Aug 2015 21:19:51 +0000 (23:19 +0200)
commitfa0cf215e723401fec62a3b336a4ed8908c2bfed
tree16875f16aa5a5b52287db818894d59fc63c48061
parent00cd69ea237c44fa76d450739240fab3223b845f
parentc242386ddbfcce3dc9e03467b3bd97b5da89de49
Merge remote-tracking branch 'upstream/master'

Conflicts:
website/reverse.php
website/search.php
lib/Geocode.php
lib/lib.php
settings/settings.php
tests/features/api/search_params.feature
tests/features/api/search_simple.feature
utils/setup.php
website/reverse.php