diff options
| author | varac <varacanero@zeromail.org> | 2012-09-23 16:09:43 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-23 16:09:43 +0200 |
| commit | 29b968b8462487f9a8dce83a95554316b53570a1 (patch) | |
| tree | aa77b144ec2c403297495fb01f8b362874dbd58f | |
| parent | 276de1e249b25e5e00c49229132215681aee6467 (diff) | |
| parent | 8fb0fcd72bdb357942d5e9adc2092e78ce6e1ee0 (diff) | |
Merge branch 'master' into openvpn
Conflicts:
.gitmodules
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | puppet/modules/sshd | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index f84f173e..a7781983 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "puppet/modules/concat"] path = puppet/modules/concat url = git://code.leap.se/puppet_concat +[submodule "puppet/modules/sshd"] + path = puppet/modules/sshd + url = git://labs.riseup.net/shared-sshd diff --git a/puppet/modules/sshd b/puppet/modules/sshd new file mode 160000 +Subproject bd2e283ab59430a7b3194804f1c8da7a9b58f8f |