]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
projects / perso / Immae / Projets / Puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ba2695 c670984)
Merge branch 'etherpad_proxy' into dev
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 28 Jun 2018 17:52:57 +0000 (19:52 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 28 Jun 2018 17:52:57 +0000 (19:52 +0200)

Trivial merge
My infrastructure configuration - Deprecated, replaced with Nix