Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 29 Jan 2020 10:12:49 +0000 (11:12 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 29 Jan 2020 10:12:49 +0000 (11:12 +0100)
commit0895002f68a51de2c237e1fe83ec6e4ffc980eff
tree34b1dbfafef2e98892c793c2001f028d1e88efd0
parent333d15790caec5c6782c3889a29b6f91d40ac42d
parent602059e794182a035f3919c3eb88d7d2085e24df
Merge branch 'master' into staging
gnu/packages/linux.scm
gnu/packages/tls.scm