Commit ba99646d authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'develop' into 'master' 

various fixes

See merge request !253
parents 8406143f 54b2d1e9
Expand all 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