Jan Tojnar 3dba2db347 Merge branch 'staging-next' into staging ... ; Conflicts: ; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml ; nixos/doc/manual/release-notes/rl-2205.section.md		2022-01-10 19:27:28 +01:00
..
manual	Merge branch 'staging-next' into staging	2022-01-10 19:27:28 +01:00
varlistentry-fixer.rb
xmlformat.conf