From: Sarah Hoffmann Date: Fri, 12 Feb 2021 14:55:27 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~183 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/80f6aca0c22984b79e24a19bc602258dd3caeb34 Merge remote-tracking branch 'upstream/master' --- 80f6aca0c22984b79e24a19bc602258dd3caeb34 diff --cc lib-php/website/403.html index 8d8e3233,00000000..8d8e3233 mode 100644,000000..100644 --- a/lib-php/website/403.html +++ b/lib-php/website/403.html diff --cc lib-php/website/509.html index 628c53bd,00000000..628c53bd mode 100644,000000..100644 --- a/lib-php/website/509.html +++ b/lib-php/website/509.html diff --cc lib-php/website/crossdomain.xml index 963a682b,00000000..963a682b mode 100644,000000..100644 --- a/lib-php/website/crossdomain.xml +++ b/lib-php/website/crossdomain.xml diff --cc lib-php/website/favicon.ico index 0157ea00,00000000..0157ea00 mode 100644,000000..100644 Binary files differ diff --cc lib-php/website/nominatim.xml index 28684b16,00000000..28684b16 mode 100644,000000..100644 --- a/lib-php/website/nominatim.xml +++ b/lib-php/website/nominatim.xml diff --cc lib-php/website/robots.txt index 9624d97c,00000000..9624d97c mode 100644,000000..100644 --- a/lib-php/website/robots.txt +++ b/lib-php/website/robots.txt diff --cc lib-php/website/taginfo.json index 98f8b978,00000000..98f8b978 mode 100644,000000..100644 --- a/lib-php/website/taginfo.json +++ b/lib-php/website/taginfo.json