Commit 6799d0fe authored by Daniel Shumway's avatar Daniel Shumway

Merge branch 'develop' into 'master'

bug: upload image correctly

See merge request !48
parents 4c0f8d27 6ccd2129
Pipeline #35885387 passed with stages
in 1 minute and 1 second