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

88 KiB

Raw Blame History

View Raw