Jonathan Ringer 5df08e00cd Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/opensimplex/default.nix pkgs/development/python-modules/pygame-gui/default.nix pkgs/top-level/aliases.nix pkgs/top-level/python-aliases.nix		2022-02-08 21:19:24 -08:00
..
manual	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf