Jonathan Ringer 11a9ac00fc Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/tools/networking/xh/default.nix		2021-05-22 18:19:10 -07:00
..
manual	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf