Jonathan Ringer c1f8a15dac Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix		2021-05-19 10:39:54 -07:00
..
manual	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf