Commit 69d9be4d authored by Ian Craggs's avatar Ian Craggs
Browse files

Merge branch 'develop' 

Conflicts:
	CONTRIBUTING.md
parents 4e619837 c4a474b2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment