Marius Bakke 2778302399
Merge branch 'master' into core-updates
Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/check.scm
	gnu/packages/cross-base.scm
	gnu/packages/gimp.scm
	gnu/packages/java.scm
	gnu/packages/mail.scm
	gnu/packages/sdl.scm
	gnu/packages/texinfo.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
2020-04-08 13:00:50 +02:00
..
2019-09-23 11:56:40 -07:00
2018-09-04 17:25:11 +02:00
2020-01-15 23:48:33 +01:00
2020-01-16 15:27:24 +01:00
2020-01-07 12:25:09 +01:00
2020-01-16 18:30:57 +01:00
2019-09-23 23:41:19 +02:00
2019-09-23 23:41:19 +02:00
2020-01-16 15:27:24 +01:00