diff options
author | varac <varacanero@zeromail.org> | 2016-06-07 11:42:58 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-06-07 11:42:58 +0200 |
commit | a671df49a987387f62bb4f39821ad8d06619f8eb (patch) | |
tree | 144b49490ef753ffb27fb553a8249eab50c03209 /puppet/modules/soledad/templates | |
parent | d0ba04981366dd15e01cb89b970b01c18e8a4530 (diff) | |
parent | f8979f8ce035ce618a6b4ff69e7a833f9a0b05ed (diff) |
Merge remote-tracking branch 'origin/0.8.x' into develop
Diffstat (limited to 'puppet/modules/soledad/templates')
0 files changed, 0 insertions, 0 deletions