diff options
| author | varac <varacanero@zeromail.org> | 2012-09-24 18:36:02 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-24 18:36:02 +0200 |
| commit | 0c3c2ff8ed6745fad5c440e295a3c171df53d765 (patch) | |
| tree | 78634f3efd767da431534b801666215db075017e | |
| parent | b6f07a78502ecbe850c0b798dfdd0fdb60a78425 (diff) | |
| parent | bedef1a878698997c5c8490599dc9269fef60c37 (diff) | |
Merge branch 'master' into openvpn
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | puppet/modules/common | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 52f3d748..8f2fd482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "puppet/modules/git"] path = puppet/modules/git url = git://code.leap.se/puppet_git +[submodule "puppet/modules/common"] + path = puppet/modules/common + url = git://labs.riseup.net/shared-common diff --git a/puppet/modules/common b/puppet/modules/common new file mode 160000 +Subproject 0961ad453b8befb4ea61bbd19f6ecea32b9619c |