aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-17 20:57:21 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-17 20:57:21 -0300
commitc38a65d0c8565ebe3d22a72c396f233929b93287 (patch)
tree90592df1a872e4f2a1c571a25b9552688df16690 /files
parent50a114ab258bd5b9186b61a9c73d82f2ffdab3f6 (diff)
parent969076a813b88dafd222c413bf6fbabab837eafb (diff)
downloadpuppet-postfix-c38a65d0c8565ebe3d22a72c396f233929b93287.tar.gz
puppet-postfix-c38a65d0c8565ebe3d22a72c396f233929b93287.tar.bz2
Merge remote-tracking branch 'shared/master' into upstreamHEADmaster
Conflicts: manifests/init.pp templates/master.cf.debian-7.erb
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions