diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
| commit | 337b6ed6c55874330fb34b41b59b90c5b5462d0b (patch) | |
| tree | e3cc2dc058b40937b6b53465d6f6b05f88b0d83f /nixpkgs/nixos/modules | |
| parent | 1f345820ffb80177db695aeea76a5d8e5f1ef6a7 (diff) | |
| parent | 1031de3638a1bd4bb6d80515718de52c195ef59a (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/nixos/modules')
| l--------- | nixpkgs/nixos/modules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules b/nixpkgs/nixos/modules index 8fbc437..8aa2488 120000 --- a/nixpkgs/nixos/modules +++ b/nixpkgs/nixos/modules @@ -1 +1 @@ -../../upstream-nixpkgs/nixos/modules
\ No newline at end of file +../../../upstream-nixpkgs/nixos/modules
\ No newline at end of file |