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	…
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	…
tests	…
artwork.scm	…
bootloader.scm	…
ci.scm	…
installer.scm	…
local.mk	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
machine.scm	…
packages.scm	…
services.scm	…
system.scm	…
tests.scm	…