diff options
| author | lassulus <lassulus@lassul.us> | 2018-11-28 18:55:08 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-11-28 18:55:08 +0100 |
| commit | a69175a719b34222c8fb734478f04190a50d70e8 (patch) | |
| tree | 765b2521aab1ab789ff56ce1550c7dcce881b3ac /tv/3modules/default.nix | |
| parent | f69a078f90d3cddfd5d3146ce39fbd294a14fb57 (diff) | |
| parent | d1f81ace7241cf751f8a02c102b02bc1c8ad6c07 (diff) | |
Merge remote-tracking branch 'ni/master' into ci
Diffstat (limited to 'tv/3modules/default.nix')
| -rw-r--r-- | tv/3modules/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index 493cc8b7..6172feb0 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -1,6 +1,7 @@ { imports = [ ./charybdis + ./dnsmasq.nix ./ejabberd ./hosts.nix ./iptables.nix |