Merge branch 'master' into staging
commit30484be05d9e318e89e12f40a55c65766cec700a
authorMarius Bakke <mbakke@fastmail.com>
Tue, 2 Jul 2019 18:14:23 +0000 (2 20:14 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Tue, 2 Jul 2019 18:14:23 +0000 (2 20:14 +0200)
treeaeae7e586fd5d790fd51728912a9c76a1cd0ddb1
parentb8d41cfc875b1a6c438ac138fdce9caa579b8486
parent2e03bbeb7be35faa1cb5b41c119d378d221266f3
Merge branch 'master' into staging
gnu/packages/check.scm
gnu/packages/gtk.scm
gnu/packages/haskell.scm
gnu/packages/tls.scm