Dmitry Kalinkin 3087088c41 Merge branch 'staging-next' into staging ... Conflicts: pkgs/top-level/aliases.nix pkgs/top-level/python-aliases.nix		2022-02-01 21:37:39 -05:00
..
manual	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf	doc: Disable wrapping source	2019-09-18 21:17:52 +02:00