Commit c5520c82 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'fix-conda' into 'master'

[conda] Fixing dependency with six

See merge request !14
parents d9f8b447 a639aa28
Pipeline #18347 passed with stages
in 48 minutes and 36 seconds