diff options
| author | varac <varacanero@zeromail.org> | 2012-10-13 10:27:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-10-13 10:27:20 +0200 |
| commit | 362cb50e73fd86cf1a7c705fdedfd6227cbe5ff3 (patch) | |
| tree | c5bf35269b20f34ee083a4ab0dd19b7fb09e0551 /puppet/modules/site_config/manifests | |
| parent | 26327946f9f414960679f3bab201a6b1385f49c9 (diff) | |
| parent | 903fcec1d18ce1553516dd13919625bdea384fe9 (diff) | |
Merge remote-tracking branch 'remotes/origin/feature/couchdb' into develop
Conflicts:
.gitmodules
Diffstat (limited to 'puppet/modules/site_config/manifests')
0 files changed, 0 insertions, 0 deletions