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
..
accounts.scm	…
activation.scm	…
bootloader.scm	…
cross-toolchain.scm	…
file-systems.scm	…
install.scm	…
linux-boot.scm	…
linux-container.scm	…
linux-initrd.scm	…
linux-modules.scm	…
locale.scm	…
marionette.scm	…
shepherd.scm	…
svg.scm	…
vm.scm	…