Merge branch 'staging'
authorMarius Bakke <mbakke@fastmail.com>
Thu, 12 Jul 2018 22:25:45 +0000 (00:25 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Thu, 12 Jul 2018 22:25:45 +0000 (00:25 +0200)
commit49b6dc2b4e02269850dacc71d9e7ec93139ec5b5
tree75c62cc7620a7602a37067dd01268393aec32698
parent7519dc95c7628ceeb5ed616604e8c432723a0a50
parent2776b5d5bf3514717cf224de34c0bf2d894f1cee
Merge branch 'staging'
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/python.scm
gnu/packages/xorg.scm