aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-06-26 00:53:16 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-06-26 00:53:16 +0200
commitbcc5318b2e938234fcc93f70d6af21367290c1ce (patch)
treec85aa84d53c6dd66626b38a3b3092dde8c459a5f /.gitmodules
parenta0fb226454d038c365d27bf5185c0831a487607f (diff)
parent9313fa2ea3c7b796b448f6249f13a588c6618889 (diff)
downloadPuppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.gz
Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.zst
Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.zip
Merge branch 'etherpad' into dev
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
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