Marius Bakke d0c45d2d82 Merge branch 'master' into core-updates ... Conflicts: gnu/packages/image.scm (incorporated libtiff graft)		2017-06-03 17:51:21 +02:00
..
bootloader
build	file-systems: Improve error reporting.	2017-05-31 21:13:15 +02:00
packages	Merge branch 'master' into core-updates	2017-06-03 17:51:21 +02:00
services	gnu: Add knot-service-type.	2017-05-27 10:40:24 +02:00
system
tests	activation: Change permissions on /root to #o700.	2017-05-30 18:08:37 +02:00
artwork.scm
bootloader.scm
local.mk	Merge branch 'master' into core-updates	2017-06-03 17:51:21 +02:00
packages.scm
services.scm
system.scm	gnu: Remove workaround for <https://bugs.gnu.org/26238>.	2017-05-28 19:08:54 +02:00
tests.scm