Jonathan Ringer 5263fb820e Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/django-rq/default.nix pkgs/top-level/all-packages.nix		2021-12-05 22:02:00 -08:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
build-support	Merge master into staging-next	2021-12-05 12:01:19 +00:00
common-updater
data	Merge master into staging-next	2021-12-05 06:01:04 +00:00
desktops	Merge pull request #148844 from r-ryantm/auto-update/xviewer	2021-12-06 05:08:22 +01:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
games	Merge pull request #146102 from kurnevsky/wesnoth	2021-12-05 20:05:06 +01:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
shells	Merge pull request #144441 from r-ryantm/auto-update/loksh	2021-12-05 14:57:30 +01:00
stdenv	Merge staging-next into staging	2021-11-30 00:02:29 +00:00
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-05 22:02:00 -08:00