Merge branch 'master' into staging
commit651478aa18a3f575d3b4cc14166a15a1c45b0f61
authorMarius Bakke <mbakke@fastmail.com>
Thu, 20 Jun 2019 21:08:16 +0000 (20 23:08 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Thu, 20 Jun 2019 21:08:16 +0000 (20 23:08 +0200)
tree87c27dc9eff3d321f7ad4a622b110c517856a104
parent71c08ee60bb3f62bac0614888fb62405f7a388ab
parent9a2e5fe5fdcc6ea848ceeefa0f70147dfb360639
Merge branch 'master' into staging
gnu/packages/check.scm
gnu/packages/glib.scm
gnu/packages/python-xyz.scm
gnu/packages/sphinx.scm
gnu/packages/xorg.scm