Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- nixos/doc/manual/release-notes/rl-2305.section.md
This commit is contained in:
Martin Weinelt 2023-03-21 12:35:40 +01:00
commit ffe3165b27
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
69 changed files with 535 additions and 948 deletions

View file

@ -1133,7 +1133,6 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
./services/web-apps/baget.nix
./services/web-apps/bookstack.nix
./services/web-apps/calibre-web.nix
./services/web-apps/coder.nix