Commit cdad41f7 authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Add conda-mirror

See merge request !67
parents cbc492dd 321982f2
Pipeline #1314 passed with stage
in 22 minutes and 10 seconds