Commit cbc492dd authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Use Parcels v1.0 conda-forge package

See merge request !66
parents 83928a41 b3322dd7
Pipeline #1312 canceled with stage
in 8 minutes and 29 seconds