aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-05-28 23:47:25 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-05-28 23:47:25 +0200
commit6f8cda185e3439777e1c3252cb3d75f0b19376fe (patch)
treedb8116ea8dfbf6ae490b9b3c220e6d9f67755d63 /nix
parent1622637bb74d03cd3070ce14195252ead032d99d (diff)
parent6c1db130a8a0cad4ff0c27f8f2e7274682a50ca4 (diff)
downloadguix-6f8cda185e3439777e1c3252cb3d75f0b19376fe.tar
guix-6f8cda185e3439777e1c3252cb3d75f0b19376fe.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions