Martin Weinelt d03d74aa67 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/aiopulse/default.nix - pkgs/development/python-modules/identify/default.nix - pkgs/development/python-modules/spur/default.nix		2023-03-12 23:28:23 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
build-support	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
common-updater
data	Merge master into staging-next	2023-03-12 12:01:31 +00:00
desktops	Merge master into staging-next	2023-03-12 12:01:31 +00:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
games	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
shells	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
stdenv
test	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00