Jonathan Ringer 5ed396a912 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/jellyfin-apiclient-python/default.nix		2021-12-23 10:14:19 -08:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-23 10:14:19 -08:00
build-support	Merge master into staging-next	2021-12-22 18:01:00 +00:00
common-updater
data	Merge master into staging-next	2021-12-22 12:01:18 +00:00
desktops	Merge pull request #146774 from pasqui23/lightly	2021-12-22 07:03:56 +01:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-23 10:14:19 -08:00
games	Merge master into staging-next	2021-12-23 06:01:11 +00:00
misc	Merge master into staging-next	2021-12-22 12:01:18 +00:00
os-specific	Merge master into staging-next	2021-12-22 00:01:35 +00:00
pkgs-lib
servers	Merge master into staging-next	2021-12-23 06:01:11 +00:00
shells
stdenv
test	Merge pull request #151411 from hercules-ci/pkgs-tests-fetch	2021-12-20 18:33:50 +01:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-23 10:14:19 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-23 10:14:19 -08:00