Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-10-09 18:00:59 +00:00 committed by GitHub
commit 75d4639be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 7180 additions and 715 deletions

View file

@ -106,7 +106,7 @@ in
identMap = mkOption {
type = types.lines;
default = "";
example = literalExample ''
example = ''
map-name-0 system-username-0 database-username-0
map-name-1 system-username-1 database-username-1
'';