diff options
author | lassulus <lass@aidsballs.de> | 2015-07-28 22:37:28 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-07-28 23:23:26 +0200 |
commit | 1cbf3f264ad073bee5766627bcb8364c52c22f9c (patch) | |
tree | a9c221113531020c777a2923255c737073adde2b /1systems/lass/uriel.nix | |
parent | a11b113866705316cdc93eddbf170e2c1236bbc0 (diff) | |
parent | 1922e43bcc16e110c03c638099a9279e1d2c89a1 (diff) |
Merge remote-tracking branch 'cd/master' into newmaster2
Diffstat (limited to '1systems/lass/uriel.nix')
0 files changed, 0 insertions, 0 deletions