Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Sat, 23 Mar 2019 21:50:07 +0000 (22:50 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Sat, 23 Mar 2019 21:50:07 +0000 (22:50 +0100)
commit3cb61ca85a634db2dcc2badaf3492440bf621d92
tree72561a5f7056aa29cec7d50fb8b960b32b44a585
parenta60370727a77d1658307698276239c153d8279e8
parentf92854fea150f0d47c4984f87bf21bd5f8051820
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/imagemagick.scm
gnu/packages/linux.scm
gnu/packages/version-control.scm
gnu/packages/video.scm
gnu/packages/xorg.scm