diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-24 14:18:03 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-24 14:18:03 -0300 |
| commit | 309d5859d9c801218075789fe068869ab49065f5 (patch) | |
| tree | dc31d7e0e39b48f75475f374d5301bba10c7c64a /manifests/server/git@git.fluxo.info:puppet-samba | |
| parent | 846ed365f19187b50f9aff0c7911b533880398a7 (diff) | |
| parent | eb97a2b642499fde7afdb64dfd3e2b7e8c14eacc (diff) | |
| download | puppet-samba-309d5859d9c801218075789fe068869ab49065f5.tar.gz puppet-samba-309d5859d9c801218075789fe068869ab49065f5.tar.bz2 | |
Merge branch 'master' of https://github.com/ajjahn/puppet-samba
Conflicts:
manifests/server/service.pp
Diffstat (limited to 'manifests/server/git@git.fluxo.info:puppet-samba')
0 files changed, 0 insertions, 0 deletions