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
common-updater
data
desktops
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-23 10:14:19 -08:00
games
misc
os-specific
pkgs-lib
servers
shells
stdenv
test
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