Alyssa Ross e2bb7997c4 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2111.section.md		2021-09-19 17:08:00 +00:00
..
manual	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf	doc: Disable wrapping source	2019-09-18 21:17:52 +02:00