Merge branch 'master' into 'master'

clean conda in proper place

See merge request !3
2 jobs for master in 31 minutes and 19 seconds (queued for 1 second)
Status Job ID Name Coverage
  Mirror
passed #62066
allowed to fail
mirror repository

00:00:21

 
  Build
passed #62067
build image

00:30:58