diff options
| author | Leo Famulari <leo@famulari.name> | 2016-08-17 23:21:00 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-08-17 23:35:22 -0400 |
| commit | 015ee84aac888b3900fa0ee54a1b7e55c083e7d3 (patch) | |
| tree | 2ef7a51321dff53e479bc6d11f3785e1c65c07f0 /nix/nix-daemon | |
| parent | a3d6e1f432ad5f9cde8bee670b28646e05c4cb19 (diff) | |
| parent | 79f9d5d5dc97e492e0583e039a2699aa17f4eb11 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/nix-daemon')
0 files changed, 0 insertions, 0 deletions