Skip to content
Commit edd537c8 authored by Mark Story's avatar Mark Story
Browse files

Merge pull request #1231 from bcrowe/3.0-post-merge 

3.0 - Fix stuff found in merge process, closes #1215
parents 0d79aa62 1cbb13e7
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