Jonathan Ringer 86f9a32c4c Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/hydra/default.nix		2022-01-07 10:31:29 -08:00
..
bsd	os-specific/netbsd: fix mandoc splicing	2021-12-10 18:30:37 -08:00
darwin	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
linux	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
solo5	solo5: 0.6.8 -> 0.6.9	2021-12-13 22:00:02 +00:00
windows	maintainers: update personal details	2021-12-31 21:48:55 +03:00