Commit 995513a3 authored by Joe Hause's avatar Joe Hause

Merge branch 'development' into 'master'

Full path to conda

See merge request !16
parents a718e997 914fd003
Pipeline #148 failed with stages