Skip to content
Snippets Groups Projects
Commit 3060cd57 authored by Casey Kuhlman's avatar Casey Kuhlman Committed by GitHub
Browse files

Merge pull request #634 from silasdavis/port-up 

Some missing commits from master needed for clean merge on develop
parents e25950f3 aee3085d
Branches release-0.17
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 200 additions and 200 deletions
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