summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-07-28 16:46:16 -0400
committerLeo Famulari <leo@famulari.name>2016-07-28 16:46:27 -0400
commit49d725a108dc33f4eb72faff7cf138c5dd8c64f4 (patch)
tree615c8bc2c83ca19f33b20678854af783f0292863 /nix
parent622c22ccb494de789588491ad94111f7a0311ddb (diff)
parenta1dfa0223329734d2cb4f9aa034183fb2573bb9c (diff)
downloadguix-49d725a108dc33f4eb72faff7cf138c5dd8c64f4.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions