Marius Bakke fb9a23a3f3 Merge branch 'master' into core-updates ... Conflicts: gnu/local.mk gnu/packages/python-xyz.scm gnu/packages/xml.scm guix/gexp.scm po/guix/POTFILES.in		2019-07-12 01:03:53 +02:00
..
bootloader
build	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
installer
machine	gnu: Add machine type for deployment specifications.	2019-07-06 02:10:04 -04:00
packages	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
services	gnu: postgres service: More secure default permissions.	2019-07-02 18:33:51 +02:00
system	etc: Remove hydra.gnu.org.pub key.	2019-06-29 14:27:22 +02:00
tests	tests: encrypted-root-os: Increase root partition size.	2019-07-06 16:17:24 +02:00
artwork.scm
bootloader.scm
ci.scm	ci: 'channel-build-system' honors the target system.	2019-07-06 16:17:24 +02:00
installer.scm
local.mk	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
machine.scm	gnu: Add machine type for deployment specifications.	2019-07-06 02:10:04 -04:00
packages.scm	Merge branch 'master' into core-updates	2019-06-27 23:33:48 +02:00
services.scm
system.scm
tests.scm