summaryrefslogtreecommitdiffstats
path: root/makefu/3modules/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-20 19:00:20 +0100
committerlassulus <lass@aidsballs.de>2015-12-20 19:00:20 +0100
commit85f3aa5b86ab9fd4afb7e5adafc0e329ab618102 (patch)
treeb5a8f94d5af87eb24c0df3a85577ab9fe4542419 /makefu/3modules/default.nix
parent07f4510ad0bff0f9d72e5dcee279a30a0d5f8da3 (diff)
parent5821d8438578db623a3e248c52fefa424fad0b51 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/3modules/default.nix')
-rw-r--r--makefu/3modules/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index 4b2b36e64..ffbf54cc0 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -3,6 +3,7 @@ _:
{
imports = [
./buildbot/master.nix
+ ./buildbot/slave.nix
];
}