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	Merge master into haskell-updates	2022-05-14 00:16:31 +00:00
desktops	Merge pull request #172429 from bobby285271/pantheon	2022-05-12 22:45:47 +08:00
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	Merge master into staging-next	2022-05-14 12:01:17 +00:00
pkgs-lib	Merge pull request #104457 from ju1m/public-inbox	2022-05-12 20:46:39 +02:00
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	Merge pull request #172570 from Artturin/epbbydefault	2022-05-13 20:46:33 +03:00
test	makeBinaryWrapper: add comment	2022-05-12 15:23:38 +02:00
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