Vladimír Čunát 3dfddd89c6 Merge branch 'master' into staging-next ... Trivial conflict in pkgs/top-level/aliases.nix		2022-02-06 10:29:49 +01:00
..
manual	Merge branch 'master' into staging-next	2022-02-06 10:29:49 +01:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf