Jonathan Ringer 12fd8a77e1 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/top-level/aliases.nix		2022-02-10 09:21:09 -08:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
build-support
common-updater
data	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
desktops	Merge pull request #158787: Pantheon: enable packagekit and drop appcenter patch	2022-02-10 12:56:27 +08:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
games	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
shells	fish: upstream patch to fix tests after pcre2 update	2022-02-10 14:12:10 +01:00
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-10 09:21:09 -08:00