summaryrefslogtreecommitdiffstats
path: root/tv/3modules/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-22 01:08:46 +0100
committerlassulus <lass@aidsballs.de>2016-02-22 01:08:46 +0100
commit020fcc22000ce35337a765bfa37f4178fbbff68c (patch)
tree8485531b5285b4dce6e9b9abecba4ccad5b9b46a /tv/3modules/default.nix
parent2924afb8a2cb7d734b56a4a8934737129a20154c (diff)
parenta2b8eb75506fa27bc3d44f6a33d860ce7d3470e0 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/3modules/default.nix')
-rw-r--r--tv/3modules/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index f7889b245..0b0bccab9 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -2,7 +2,8 @@ _:
{
imports = [
- ./ejabberd.nix
+ ./charybdis
+ ./ejabberd
./iptables.nix
];
}