diff options
| author | varac <varacanero@zeromail.org> | 2014-02-13 17:22:18 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-13 17:22:18 +0100 |
| commit | 761fe6f40058612d6ac0ce88103c9a4f35877ef8 (patch) | |
| tree | cdacb4408633076fde04213fd27a48aa6c990a2e /puppet/manifests/setup.pp | |
| parent | 251c250fe5cf44c99a74d4359cb29b0bf165f3af (diff) | |
| parent | c1d1d9d7cf6fefd1203cc09a66c2e0230b930b5e (diff) | |
Merge branch 'fix_develop' into develop
This was needed so current develop plays nicely with latest leap_cli.
Diffstat (limited to 'puppet/manifests/setup.pp')
0 files changed, 0 insertions, 0 deletions