]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
1  2 
settings/settings.php
sql/functions.sql
utils/setup.php

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