summaryrefslogtreecommitdiffstats
path: root/lass/1systems/uriel.nix
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-10-04 13:52:11 +0200
committertv <tv@shackspace.de>2015-10-04 13:52:11 +0200
commit864d3223842d190e99f29df2936d5e0db5b04df2 (patch)
treecc9e2f99a658af6cd21a918ac6c3cc8a62f1749a /lass/1systems/uriel.nix
parentf7a4ec4e5b6f863bf36d3a09c0a19d6318e99fb8 (diff)
parent96a8a66cfb7fac2d4ca867c2dd91de2631649471 (diff)
Merge remote-tracking branches 'mors/master' and 'pnp/master'
Diffstat (limited to 'lass/1systems/uriel.nix')
0 files changed, 0 insertions, 0 deletions