]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 8 Feb 2016 19:42:19 +0000 (20:42 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 8 Feb 2016 19:42:19 +0000 (20:42 +0100)
1  2 
settings/settings.php
website/reverse.php

Simple merge
Simple merge