diff options
| author | varac <varacanero@zeromail.org> | 2013-08-29 19:42:56 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-29 19:42:56 +0200 |
| commit | 7ec54bd92bc63e1d7a5213196c1b4fb1bbe1b0b4 (patch) | |
| tree | ae7ceba336f8d3c1a5bf40cd8e6ba2115f21aea4 /puppet/modules/soledad/manifests/server.pp | |
| parent | 7240764c9f1f319a002eb63f7a2dc26a2d479d31 (diff) | |
updated submodule couchdb, fixed merge resolution error from last merge
Diffstat (limited to 'puppet/modules/soledad/manifests/server.pp')
0 files changed, 0 insertions, 0 deletions