Dmitry Kalinkin 477540469e Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/gradient-utils/default.nix pkgs/development/python-modules/gradient/default.nix		2022-01-08 02:39:35 -05:00
..
applications	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
build-support	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
common-updater
data	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
development	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
games	crafty: remove	2022-01-07 16:45:55 +07:00
misc	Merge pull request #153830 from datafoo/vscode-extensions.naumovs.color-highlight	2022-01-08 13:33:49 +08:00
os-specific	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
shells
stdenv
test
tools	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00
top-level	Merge branch 'master' into staging-next	2022-01-08 02:39:35 -05:00