Jan Tojnar d995596052 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		2021-12-31 15:32:37 +01:00
..
manual	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
varlistentry-fixer.rb
xmlformat.conf