Jan Tojnar 997bb5e42c Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/development/python-modules/dnspython/default.nix ; pkgs/development/python-modules/googleapis-common-protos/default.nix		2022-03-28 17:55:31 +02:00
..
manual	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf