summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
committervarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
commit8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (patch)
tree5ca58ed2e9d52f7bd4071b6902cba064a75d81f6 /.gitmodules
parenta275999ab39b49afa2bb0c998c58aec424b4a8c0 (diff)
parent90c5b205c4764351e6ea707b965c5e6daca1c0b7 (diff)
Merge branch 'stunnel_switch' into develop
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 45763175..b97971fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,3 +67,6 @@
[submodule "puppet/modules/tor"]
path = puppet/modules/tor
url = git://labs.riseup.net/shared-tor
+[submodule "puppet/modules/stunnel"]
+ path = puppet/modules/stunnel
+ url = git://labs.riseup.net/shared-stunnel