Skip to content
Snippets Groups Projects
Verified Commit b0437f19 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

Merge branch 'master' into puppet5 

Conflicts:
	NEWS
parents 1416e38e 4f97536f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment