diff options
| author | Micah <micah@riseup.net> | 2016-11-04 13:35:41 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2016-11-04 13:35:41 +0000 |
| commit | 584b7aad338206026d62d846122e6bef532a2d2a (patch) | |
| tree | e58bac6baf47d069f646bd78519550f4fb0d39a6 /98ad878c1a0d2dfbeb9ff91d155ac759e12f1d4e: | |
| parent | bd975e939717891b79fce1d7d91da4ce4528af12 (diff) | |
| parent | c7581a1f0e2b64b186a2d7c37e7ba0a9fa2cc1df (diff) | |
Merge branch 'puppet4' into 'master'
Puppet4
Fixes stuff for puppet 4
See merge request !54
Diffstat (limited to '98ad878c1a0d2dfbeb9ff91d155ac759e12f1d4e:')
0 files changed, 0 insertions, 0 deletions