Commit bce0149d authored by David Hendriks's avatar David Hendriks
Browse files

Merge branch 'paper/joss' into development_1.0.0/2.2.4

parents cadb5902 2c9d3438
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