Marius Bakke ae0badf5bb Merge branch 'master' into core-updates ... Conflicts: gnu/packages/admin.scm gnu/packages/commencement.scm gnu/packages/guile.scm gnu/packages/linux.scm gnu/packages/package-management.scm gnu/packages/pulseaudio.scm gnu/packages/web.scm		2020-03-30 12:17:33 +02:00
..
bootloader	gnu: bootloader: Add grub-minimal-bootloader.	2020-03-29 15:31:18 +02:00
build	Merge branch 'master' into core-updates	2020-03-30 12:17:33 +02:00
installer	installer: tests: Use a filter to select desktop-environments.	2020-03-26 11:53:50 +01:00
machine
packages	Merge branch 'master' into core-updates	2020-03-30 12:17:33 +02:00
services	Merge branch 'master' into core-updates	2020-03-30 12:17:33 +02:00
system	Merge branch 'master' into core-updates	2020-03-30 12:17:33 +02:00
tests	tests: install: Add %test-gui-installed-desktop-os-encrypted.	2020-03-26 11:53:50 +01:00
artwork.scm
bootloader.scm
ci.scm
installer.scm	Merge branch 'master' into core-updates	2020-03-27 00:12:15 +01:00
local.mk	Merge branch 'master' into core-updates	2020-03-30 12:17:33 +02:00
machine.scm
packages.scm
services.scm
system.scm	Merge branch 'master' into core-updates	2020-03-27 00:12:15 +01:00
tests.scm