]> gitweb.fluxo.info Git - puppet-postfix.git/commitdiff
Merge remote-tracking branch 'shared/master' into upstream master
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jun 2016 23:57:21 +0000 (20:57 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jun 2016 23:57:21 +0000 (20:57 -0300)
Conflicts:
manifests/init.pp
templates/master.cf.debian-7.erb

1  2 
templates/master.cf.debian-6.erb

Simple merge