Jan Tojnar d995596052 Merge branch 'staging-next' into staging ... ; Conflicts: ; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml ; nixos/doc/manual/release-notes/rl-2205.section.md		2021-12-31 15:32:37 +01:00
..
applications	Merge master into staging-next	2021-12-31 12:01:24 +00:00
build-support	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
common-updater
data	Merge master into staging-next	2021-12-31 12:01:24 +00:00
desktops
development	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
games	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
misc	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
os-specific	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00
pkgs-lib
servers	Merge master into staging-next	2021-12-31 12:01:24 +00:00
shells	oil: 0.9.5 -> 0.9.6	2021-12-30 08:32:20 -05:00
stdenv
test
tools	Merge master into staging-next	2021-12-31 12:01:24 +00:00
top-level	Merge branch 'staging-next' into staging	2021-12-31 15:32:37 +01:00