Florian Klink 93dcbbf69d systemd: add withApparmor option		2020-10-28 23:24:18 +01:00
..
applications	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
build-support	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
common-updater
data	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
desktops	Merge branch master into staging to fix eval error	2020-10-28 03:03:27 +01:00
development	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
games	Merge pull request #101859 from andir/steam-desktop	2020-10-27 12:33:24 -04:00
misc	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
os-specific	systemd: add withApparmor option	2020-10-28 23:24:18 +01:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
shells	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
stdenv	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
test	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tools	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
top-level	systemd: add withApparmor option	2020-10-28 23:24:18 +01:00