Commit cdad41f7 authored Jan 31, 2018 by Willi Rath

Merge branch 'develop' into 'master'

Add conda-mirror

See merge request !67