summaryrefslogtreecommitdiffstats
path: root/makefu/3modules/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-16 15:46:23 +0100
committerlassulus <lass@aidsballs.de>2015-12-16 15:46:23 +0100
commit07f4510ad0bff0f9d72e5dcee279a30a0d5f8da3 (patch)
tree5848f7727500895df71a523a3405087448ba9e4a /makefu/3modules/default.nix
parentd94784efbecbd437ec6268bb9bfca57a8088d6e8 (diff)
parent8f18b00ab141df92b7df4725a18bb3283b184d76 (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 a8a1f69d0..4b2b36e64 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -2,6 +2,7 @@ _:
{
imports = [
+ ./buildbot/master.nix
];
}