aboutsummaryrefslogtreecommitdiff
path: root/files/boilerplate/policy.footer
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
commitdffe0d74eadc7c25ab9ee513cb3a6b345dfa7644 (patch)
tree53e848d9d576687ec2c032564b6c42ba21b678f1 /files/boilerplate/policy.footer
parent589f5723d500ad7325e19dfeb1d3b8450044acf1 (diff)
parentedd5db0159d5075609c545fb3ee10727a1cf5271 (diff)
downloadpuppet-shorewall-dffe0d74eadc7c25ab9ee513cb3a6b345dfa7644.tar.gz
puppet-shorewall-dffe0d74eadc7c25ab9ee513cb3a6b345dfa7644.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmaster
Conflicts: manifests/tunnel.pp
Diffstat (limited to 'files/boilerplate/policy.footer')
0 files changed, 0 insertions, 0 deletions