Skip to content
Snippets Groups Projects
Commit d94351d3 authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'hotfix/ConnIntegrationFix' into 'release' 

Hotfix/conn integration fix

See merge request !31
parents e22b511f f6693e97
No related branches found
No related tags found
2 merge requests!68Master merge,!31Hotfix/conn integration fix
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 60 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