]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 7 Apr 2013 16:00:49 +0000 (18:00 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 7 Apr 2013 16:00:49 +0000 (18:00 +0200)
1  2 
utils/setup.php
website/search.php

diff --cc utils/setup.php
Simple merge
Simple merge