]> gitweb.fluxo.info Git - puppet-samba.git/commitdiff
projects / puppet-samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 846ed36 eb97a2b)
Merge branch 'master' of https://github.com/ajjahn/puppet-samba
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Mar 2016 17:18:03 +0000 (14:18 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Mar 2016 17:18:03 +0000 (14:18 -0300)
Conflicts:
manifests/server/service.pp


Trivial merge
Puppet module for samba