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

This commit is contained in:
Tom Hughes 2022-02-13 18:39:21 +00:00
commit 53aa7259bb
12 changed files with 281 additions and 267 deletions

View file

@ -132,3 +132,8 @@ smtp_enable_starttls_auto: false
smtp_authentication: null
smtp_user_name: null
smtp_password: null
# Storage services
avatar_storage: "local"
trace_file_storage: "local"
trace_image_storage: "local"
trace_icon_storage: "local"

View file

@ -19,3 +19,8 @@ wikipedia_auth_id: "dummy"
wikipedia_auth_secret: "dummy"
# Server URL for testing
server_url: "test.host"
# Storage services for testing
avatar_storage: "test"
trace_file_storage: "test"
trace_image_storage: "test"
trace_icon_storage: "test"