Commit 4ecf4467 authored by Theo Plockyn's avatar Theo Plockyn

Merge branch 'develop' into 'master'

Resynchro develop/master 🥳

Closes canopsis#1855 and #90

See merge request !238
parents 4414b0e3 88ba64b7
Pipeline #7062 passed with stage
in 2 minutes and 1 second