From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 27 Jun 2018 20:48:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~320
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/66adbf6a055c877a82fce52767bed7094d0f73a9?hp=-c

Merge remote-tracking branch 'upstream/master'
---

66adbf6a055c877a82fce52767bed7094d0f73a9
diff --combined CMakeLists.txt
index d532bf55,4e55a8a5..3f06d842
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -93,18 -93,11 +93,19 @@@ set(CUSTOMFILE
      website/reverse.php
      website/search.php
      website/status.php
 +    website/403.html
 +    website/509.html
 +    website/crossdomain.xml
 +    website/favicon.ico
 +    website/last_update.php
 +    website/nominatim.xml
 +    website/robots.txt
 +    website/taginfo.json
      utils/blocks.php
      utils/country_languages.php
      utils/imports.php
      utils/importWikipedia.php
+     utils/export.php
      utils/query.php
      utils/server_compare.php
      utils/setup.php