diff options
| author | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
| commit | f72c47077aab69170fa1ca56e6ce9a6b1fc9c402 (patch) | |
| tree | 773e55de49edd873ca867df73cce83e02f973e52 /LICENSE | |
| parent | 721bf57600f9730a56f744150be34aa9e96457f8 (diff) | |
| parent | 5a9e3a456e8c9023222abb3ab08ae80323a1470a (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
README
manifests/init.pp
manifests/unattended_upgrades.pp
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions