Tobias Geerinckx-Rice 9dea3f101f Merge branch 'master' into core-updates ... Conflicts: gnu/packages/cups.scm gnu/packages/python-web.scm gnu/packages/web.scm guix/build/maven/pom.scm		2021-06-23 18:45:21 +02:00
..
bootloader
build
installer	installer: Remove unused procedure.	2021-06-23 03:01:49 +02:00
machine
packages	Merge branch 'master' into core-updates	2021-06-23 18:45:21 +02:00
services	Merge branch 'master' into core-updates	2021-06-23 18:45:21 +02:00
system
tests
artwork.scm
bootloader.scm
ci.scm
image.scm
installer.scm
local.mk	Merge branch 'master' into core-updates	2021-06-23 18:45:21 +02:00
machine.scm
packages.scm
services.scm
system.scm
tests.scm