Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 11 Dec 2019 22:21:27 +0000 (23:21 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 11 Dec 2019 22:21:27 +0000 (23:21 +0100)
commit9b601fc2110193435e61955c04499fed019aac62
tree37cca3a505989485fcfb653ebcb0dd8ee55d5308
parent939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd
parent27664ea0f08e6c207b7b61c1fd7b8446dce98478
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/nss.scm