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
..
2018-09-04 17:25:11 +02:00
2017-01-26 13:49:56 +01:00
2019-06-17 16:13:36 +02:00
2018-09-04 17:25:11 +02:00
2015-11-26 22:35:01 +01:00
2018-09-04 17:25:11 +02:00
2018-09-07 11:40:22 +02:00
2019-04-10 17:09:47 +02:00
2019-05-22 00:09:41 +02:00
2019-02-05 22:33:06 +01:00
2018-09-04 17:25:11 +02:00
2018-10-29 00:13:38 +01:00
2019-03-24 00:13:53 +01:00
2019-04-10 17:09:47 +02:00
2019-06-27 11:14:40 +02:00
2017-06-15 17:03:19 +02:00
2019-06-14 21:57:39 +02:00
2017-11-17 10:47:49 +01:00