Commit 7be687c3 authored by Alex Bernard Francia's avatar Alex Bernard Francia

Merge branch 'final' into 'develop'

Final Version

See merge request !1
parents 996fbb3b af06a607
Pipeline #858 failed with stages