Commit 6a513ef5 authored by Alan O'Cais's avatar Alan O'Cais

Merge branch 'master' into 'master'

Master

See merge request e-cam/E-CAM-Library!191
parents d29d636a 81e529a0
Pipeline #5277 passed with stages
in 2 minutes and 9 seconds