Skip to content
Commit cbc492dd authored by Willi Rath's avatar Willi Rath
Browse files

Merge branch 'develop' into 'master' 

Use Parcels v1.0 conda-forge package

See merge request !66
parents 83928a41 b3322dd7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment