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
..
2017-08-13 07:36:32 +01:00
2020-03-02 23:39:44 +01:00
2019-09-25 08:35:33 +01:00
2019-03-20 20:31:15 +01:00
2018-12-24 11:18:36 +02:00
2020-03-25 14:17:24 +01:00
2020-03-16 14:05:52 +01:00