Dmitry Kalinkin ac40a963c9 Merge branch 'master' into staging-next ... Conflicts: pkgs/applications/editors/vim/common.nix pkgs/development/python-modules/jellyfin-apiclient-python/default.nix pkgs/development/python-modules/pymavlink/default.nix		2021-12-20 12:09:28 -05: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	2021-12-05 22:02:00 -08:00
linux	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05: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