Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2018-08-28 01:22:24 +02:00
commit 61fca0fd22
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
42 changed files with 12366 additions and 46840 deletions

View file

@ -22,7 +22,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;