Merge remote-tracking branch 'upstream/master'
drwxr-xr-x - .github
-rw-r--r-- 151 .gitignore
-rw-r--r-- 115 .gitmodules
-rw-r--r-- 304 .pylintrc
-rw-r--r-- 248 AUTHORS
-rw-r--r-- 9863 CMakeLists.txt
-rw-r--r-- 2519 CONTRIBUTING.md
-rw-r--r-- 18092 COPYING
-rw-r--r-- 13168 ChangeLog
-rw-r--r-- 2804 README.md
-rw-r--r-- 1636 SECURITY.md
-rw-r--r-- 5980 VAGRANT.md
-rw-r--r-- 3062 Vagrantfile
drwxr-xr-x - cmake
-rw-r--r-- 168 codecov.yml
drwxr-xr-x - data
drwxr-xr-x - docs
drwxr-xr-x - lib-php
drwxr-xr-x - lib-sql
drwxr-xr-x - manual
drwxr-xr-x - module
drwxr-xr-x - munin
drwxr-xr-x - nominatim
m--------- - osm2pgsql
-rw-r--r-- 5356 phpcs.xml
drwxr-xr-x - settings
drwxr-xr-x - test
drwxr-xr-x - utils
drwxr-xr-x - vagrant
drwxr-xr-x - website