Jonathan Ringer 12fd8a77e1 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/top-level/aliases.nix		2022-02-10 09:21:09 -08:00
..
manual	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf