Merge branch 'master' into staging
authorJakub Kądziołka <kuba@kadziolka.net>
Sat, 28 Mar 2020 23:38:13 +0000 (00:38 +0100)
committerJakub Kądziołka <kuba@kadziolka.net>
Sat, 28 Mar 2020 23:38:13 +0000 (00:38 +0100)
1  2 
gnu/local.mk
gnu/packages/linux.scm

diff --cc gnu/local.mk
Simple merge
Simple merge