]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 21 Oct 2013 16:30:34 +0000 (18:30 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 21 Oct 2013 16:30:34 +0000 (18:30 +0200)
commit2db6f931b6ce1d331433f7e4f02ac332381a7b29
treef5c5f9095f266736ca8e2bf40c815e246dcb4a9e
parent3d965df4c23e5dbd0954f5ec0747851de361313a
parent17e2e95b530018c0f090a20dfee2246acc4f4f94
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/init-website.php
settings/settings.php