Merge remote-tracking branch 'upstream/pull/3561'

This commit is contained in:
Tom Hughes 2022-06-06 18:32:43 +01:00
commit a566589c1b
70 changed files with 125244 additions and 160816 deletions

View file

@ -82,7 +82,7 @@ default_editor: "id"
# OAuth application for the web site
#oauth_application: ""
# OAuth consumer key for iD
#id_key: ""
#id_oauth_application: ""
# Imagery to return in capabilities as blacklisted
imagery_blacklist:
# Current Google imagery URLs have google or googleapis in the domain