Marius Bakke 5bace4c8ad Merge branch 'master' into core-updates ... Conflicts: * gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e21).		2017-06-11 02:07:06 +02:00
..
bootloader	bootloader: Use menu-entry to define custom bootloader entries.	2017-06-08 16:29:29 +02:00
build	file-systems: Provide string->ext*-uuid, string->btrfs-uuid.	2017-06-10 19:22:03 +02:00
packages	Merge branch 'master' into core-updates	2017-06-11 02:07:06 +02:00
services	services: guix: Add 'max-silent-time' and 'timeout'.	2017-06-05 01:42:38 +02:00
system	mapped-devices: Cope with delayed appearance of LUKS source.	2017-06-07 19:03:03 -04:00
tests	activation: Change permissions on /root to #o700.	2017-05-30 18:08:37 +02:00
artwork.scm	artwork: Use a descriptive name for the source directory.	2017-06-07 15:58:16 -04:00
bootloader.scm	bootloader: Use menu-entry to define custom bootloader entries.	2017-06-08 16:29:29 +02:00
local.mk	Merge branch 'master' into core-updates	2017-06-11 02:07:06 +02:00
packages.scm	…
services.scm	…
system.scm	Merge branch 'master' into core-updates	2017-06-11 02:07:06 +02:00
tests.scm	…