Marius Bakke c4133c43c7 Merge branch 'master' into core-updates-frozen ... Conflicts: gnu/packages/algebra.scm gnu/packages/games.scm gnu/packages/golang.scm gnu/packages/kerberos.scm gnu/packages/mail.scm gnu/packages/python.scm gnu/packages/ruby.scm gnu/packages/scheme.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm		2021-08-12 00:30:27 +02:00
..
bootloader
build	Merge branch 'master' into core-updates-frozen	2021-08-12 00:30:27 +02:00
installer
machine
packages	Merge branch 'master' into core-updates-frozen	2021-08-12 00:30:27 +02:00
services	Merge branch 'master' into core-updates-frozen	2021-08-12 00:30:27 +02:00
system
tests
artwork.scm
bootloader.scm
ci.scm
image.scm
installer.scm
local.mk	Merge branch 'master' into core-updates-frozen	2021-08-12 00:30:27 +02:00
machine.scm
packages.scm
services.scm
system.scm
tests.scm