HCoop / jackhill / guix / guix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 939c5b2 27664ea)
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)
1  2 
gnu/local.mk patch | diff1 | diff2 | blob | history
gnu/packages/nss.scm patch | diff1 | diff2 | blob | history

diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/nss.scm
Simple merge
jackhill's copy of GNU Guix: https://guix.gnu.org/