summaryrefslogtreecommitdiffstats
path: root/nixpkgs/nixos
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-11 23:18:00 +0100
committermakefu <github@syntax-fehler.de>2016-02-11 23:18:00 +0100
commit524a009c1e6cab6b38f6306ea2622581412aea5e (patch)
treef4a6499d505ad38aa674e6a62289bc7a71b3bca7 /nixpkgs/nixos
parent014cbb7598c5d45cfc4cc7e1ec81c92e000eabfb (diff)
parent6cbe21aac7680af7a6c6c2ea367ee0569d53bb21 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/nixos')
0 files changed, 0 insertions, 0 deletions