]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 6 Mar 2015 06:57:20 +0000 (07:57 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 6 Mar 2015 06:57:20 +0000 (07:57 +0100)
commitcefa7a3c3bba1e072e1518062da7fd1c1facdc00
tree70f643980760a49bd7ce3c888b1e32512c18bb2a
parent1f951e863a870854188603b29c8a98e3897dccdd
parent9f4c7f4e6d060a08bc2c5c0bb6cf847f38011777
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/functions.sql
sql/tables.sql
sql/functions.sql
sql/tables.sql