Jonathan Ringer 5263fb820e Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/django-rq/default.nix pkgs/top-level/all-packages.nix		2021-12-05 22:02:00 -08:00
..
bsd	netbsd.man: fix build	2021-11-15 14:26:13 +01:00
darwin	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
linux	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
solo5
windows	Merge pull request #145205 from Stunkymonkey/treewide-pname-version-1	2021-11-13 19:32:52 +01:00