diff options
| author | tv <tv@krebsco.de> | 2015-12-20 19:37:46 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-12-20 19:37:46 +0100 |
| commit | c89907175546aa0c39bc6b2c4960f0ea6e6db8c9 (patch) | |
| tree | 158bf1a5938fc37efc466b00b3f0906ac2a50d9f /makefu/3modules/default.nix | |
| parent | c09bc6a29f21f1c6bd21575e385b8b3bc5c89b8a (diff) | |
| parent | 5821d8438578db623a3e248c52fefa424fad0b51 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/3modules/default.nix')
| -rw-r--r-- | makefu/3modules/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix index a8a1f69d0..ffbf54cc0 100644 --- a/makefu/3modules/default.nix +++ b/makefu/3modules/default.nix @@ -2,6 +2,8 @@ _: { imports = [ + ./buildbot/master.nix + ./buildbot/slave.nix ]; } |