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
..
scripts	pluginupdate.py: fix regression with plugin line splitting	2022-01-21 14:18:21 +01:00
maintainer-list.nix	Remove oxalica as the maintainer at her request	2022-02-08 11:47:39 -08:00
team-list.nix	maintainers.sphinx: add	2022-01-28 21:23:49 +01:00