From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 16 Nov 2018 23:11:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~300
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0df5f77bc4c92e2f8f635105441779277435da67

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

0df5f77bc4c92e2f8f635105441779277435da67
diff --cc CMakeLists.txt
index 0c6d4094,d6f7d2cb..7c5763fd
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -103,17 -103,8 +103,16 @@@ 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