Merge branch 'main' into versions/5.0.0

# Conflicts:
#	RELEASE_NOTES.md
#	config/quota-file.json
This commit is contained in:
Joachim Van Herwegen
2022-07-04 13:53:17 +02:00
26 changed files with 193 additions and 35 deletions

View File

@@ -5,10 +5,10 @@
"comment": "This is an example of what an actual email sender configuration would look like.",
"@id": "urn:solid-server:default:EmailSender",
"@type": "BaseEmailSender",
"args_senderName": "Solid Server",
"args_senderName": "Community Solid Server <solid@example.email>",
"args_emailConfig_host": "smtp.example.email",
"args_emailConfig_port": 587,
"args_emailConfig_auth_user": "alice@example.email",
"args_emailConfig_auth_user": "solid@example.email",
"args_emailConfig_auth_pass": "NYEaCsqV7aVStRCbmC"
}
]

View File

@@ -16,7 +16,7 @@
"css:config/identity/pod/static.json",
"css:config/identity/registration/enabled.json",
"css:config/ldp/authentication/dpop-bearer.json",
"css:config/ldp/authorization/allow-all.json",
"css:config/ldp/authorization/webacl.json",
"css:config/ldp/handler/default.json",
"css:config/ldp/metadata-parser/default.json",
"css:config/ldp/metadata-writer/default.json",