Commit ee2fa69e authored by Plup's avatar Plup

Merge branch 'dev' into 'master'

Dev to master

See merge request !102
parents 4bd5b161 8840eb2a
Pipeline #7059 passed with stages
in 25 seconds