Jan Tojnar d1b77f990f Merge branch 'staging-next' into staging ... Conflicts: pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935 and a373324120.		2022-05-15 07:08:29 +02:00
..
applications	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
build-support	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
common-updater
data
desktops
development	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
games	Merge pull request #171310 from IvarWithoutBones/fix/dotnetmodule-flags	2022-05-14 23:15:25 +02:00
misc	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
os-specific
pkgs-lib
servers	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
shells	Merge master into staging-next	2022-05-15 00:02:28 +00:00
stdenv
test
tools	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00
top-level	Merge branch 'staging-next' into staging	2022-05-15 07:08:29 +02:00