Dmitry Kalinkin b6b59334bb Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/celery/default.nix pkgs/development/python-modules/kombu/default.nix		2021-12-11 13:15:49 -05:00
..
applications	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
build-support	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
common-updater
data	Merge master into staging-next	2021-12-11 06:01:15 +00:00
desktops	Merge pull request #150233 from bobby285271/pantheon	2021-12-11 22:04:27 +08:00
development	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
games	Merge pull request #150265 from legendofmiracles/gzdoom	2021-12-11 17:45:54 +01:00
misc	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
shells
stdenv	Merge master into staging-next	2021-12-11 00:01:48 +00:00
test
tools	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
top-level	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00