diff options
author | makefu <github@syntax-fehler.de> | 2016-02-22 14:35:59 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-02-22 14:35:59 +0100 |
commit | b25d15573ab10a4b2dd55e46291fbab6adf70162 (patch) | |
tree | 1036547a8003c5767565d53d748d83d3614271b6 /tv/3modules/default.nix | |
parent | 5b7039f1f11e7cf2da6f3735cc7d99322a31c7a5 (diff) | |
parent | 8393444dce1888d369955e46dd16983a43762bb9 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/3modules/default.nix')
-rw-r--r-- | tv/3modules/default.nix | 3 |
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 ]; } |