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
..
doc
guix	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
packages