Marius Bakke 8bf8cd9b85 Merge branch 'master' into core-updates ...

Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm

2020-04-30 23:47:49 +02:00

..

examples

…

accounts.scm

…

file-systems.scm

…

hurd.scm

…

install.scm

…

keyboard.scm

…

linux-container.scm

…

linux-initrd.scm

…

locale.scm

…

mapped-devices.scm

…

nss.scm

…

pam.scm

…

shadow.scm

…

uuid.scm

…

vm.scm

…