summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-21 07:46:32 +0000
committerintrigeri <intrigeri@boum.org>2016-05-21 07:46:32 +0000
commit15c4a63aca08da5fbf5de7a9a97051b80cc72ce1 (patch)
tree67b136b366a7dc33ab6f923884764b6b31c28d72 /.gitmodules
parent437a053a22e97e21b86a8e417bd9b37e1c2d931a (diff)
parent75b27e3e733f27df9f3887e553b2ead600520bd5 (diff)
Merge remote-tracking branch 'origin/devel' into feature/11123-new-mirror-pool
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index f75ba5b..892c235 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,10 @@
[submodule "submodules/jenkins-tools"]
path = submodules/jenkins-tools
url = https://git-tails.immerda.ch/jenkins-tools
+[submodule "submodules/chutney"]
+ path = submodules/chutney
+ url = https://git-tails.immerda.ch/chutney
+ branch = feature/tails_test_suite
[submodule "submodules/mirror-pool-dispatcher"]
path = submodules/mirror-pool-dispatcher
url = https://git-tails.immerda.ch/mirror-pool-dispatcher