Jonathan Ringer 39669ea2b6 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/top-level/aliases.nix		2022-02-09 19:58:40 -08:00
..
scripts	pluginupdate.py: fix regression with plugin line splitting	2022-01-21 14:18:21 +01:00
maintainer-list.nix	maintainers: add congee	2022-02-09 19:41:46 -08:00
team-list.nix	maintainers.sphinx: add	2022-01-28 21:23:49 +01:00