diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-26 00:53:16 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-26 00:53:16 +0200 |
commit | bcc5318b2e938234fcc93f70d6af21367290c1ce (patch) | |
tree | c85aa84d53c6dd66626b38a3b3092dde8c459a5f /.gitmodules | |
parent | a0fb226454d038c365d27bf5185c0831a487607f (diff) | |
parent | 9313fa2ea3c7b796b448f6249f13a588c6618889 (diff) | |
download | Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.gz Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.zst Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.zip |
Merge branch 'etherpad' into dev
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 0f21622..d68cf4e 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -64,3 +64,6 @@ | |||
64 | [submodule "external_modules/slack"] | 64 | [submodule "external_modules/slack"] |
65 | path = external_modules/slack | 65 | path = external_modules/slack |
66 | url = git://git.immae.eu/github/cegeka/puppet-slack | 66 | url = git://git.immae.eu/github/cegeka/puppet-slack |
67 | [submodule "external_modules/patch"] | ||
68 | path = external_modules/patch | ||
69 | url = git://git.immae.eu/github/tohuwabohu/puppet-patch.git | ||