Jan Tojnar f7aa55946b 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 ; pkgs/build-support/libredirect/default.nix		2022-01-10 01:26:05 +01:00
..
manual	Merge branch 'staging-next' into staging	2022-01-10 01:26:05 +01:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf