Commit a13360d1 authored by Anton Akhmerov's avatar Anton Akhmerov

Merge branch 'master' into 'master'

clean conda in proper place

See merge request !3
parents c81af745 ed3be50b
Pipeline #18121 passed with stages
in 31 minutes and 19 seconds