diff options
| author | varac <varacanero@zeromail.org> | 2013-02-07 12:34:51 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-02-07 12:34:51 +0100 |
| commit | 93a514a61ccfd656796d5b5cd143ea4cfacbc15b (patch) | |
| tree | 37bb3f26e23060858336a5f5e38b5aac2fefc280 /.gitmodules | |
| parent | 07cc737f655c9fc0afe50e9850963120114ee18e (diff) | |
| parent | 173b2dc3ecbdab2cacede4e50f6fa3f5daa3c683 (diff) | |
Merge branch 'feature/tor' into develop
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 75fc99f0..21966fc3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,6 @@ [submodule "puppet/modules/nagios"] path = puppet/modules/nagios url = git://code.leap.se/puppet_nagios +[submodule "puppet/modules/tor"] + path = puppet/modules/tor + url = git://labs.riseup.net/shared-tor |