Code Review / puppet-modules / puppetlabs-firewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 3e40b9b 9cea821)
Merge branch 'master' into release
authordavid22swan <david.swan@puppet.com>
Tue, 7 Nov 2017 13:50:34 +0000 (13:50 +0000)
committerGitHub <noreply@github.com>
Tue, 7 Nov 2017 13:50:34 +0000 (13:50 +0000)
1  2 
README.markdown patch | diff1 | diff2 | blob | history
metadata.json patch | diff1 | diff2 | blob | history

diff --cc README.markdown
Simple merge
diff --cc metadata.json
Simple merge