Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 12 Dec 2018 21:00:52 +0000 (22:00 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 12 Dec 2018 21:00:52 +0000 (22:00 +0100)
commit12878d12acccf83ef3258a53a01f851088f0aa9e
tree47f875b50bd7714251256475317e96f4e6d73f55
parent17c3e0d85d9c1a6b4c09d09dd9238297b6165a2f
parent7b046b1bdc0b1cbc50428d4e08136a110f0a12af
Merge branch 'master' into staging
doc/guix.texi
gnu/local.mk
gnu/packages/audio.scm
gnu/packages/emacs.scm
gnu/packages/gnuzilla.scm
gnu/packages/linux.scm
gnu/packages/maths.scm
gnu/packages/pdf.scm
gnu/packages/tls.scm
gnu/packages/video.scm