Jan Tojnar 380c030740 Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/development/python-modules/aiohttp-socks/default.nix ; pkgs/development/python-modules/emv/default.nix ; pkgs/development/python-modules/mocket/default.nix ; pkgs/development/python-modules/types-protobuf/default.nix		2021-12-31 07:26:03 +01:00
..
bsd	os-specific/netbsd: fix mandoc splicing	2021-12-10 18:30:37 -08:00
darwin	Merge staging-next into staging	2021-12-06 12:01:55 +00:00
linux	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
solo5	solo5: 0.6.8 -> 0.6.9	2021-12-13 22:00:02 +00:00
windows	Merge pull request #145205 from Stunkymonkey/treewide-pname-version-1	2021-11-13 19:32:52 +01:00