diff options
author | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
commit | a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15 (patch) | |
tree | ba2c4880e3f4ce6509ff219d0fd646493d085e1d /nix/nix-daemon | |
parent | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (diff) | |
parent | 20095cc5139666fe67b3ae76b3f46ff85e4956bb (diff) | |
download | patches-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar patches-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar.gz |
Merge branch 'master' into security-updates
Diffstat (limited to 'nix/nix-daemon')
0 files changed, 0 insertions, 0 deletions