Commit ebc69944 authored by Kay's avatar Kay

Merge branch 'master' into 'master'

Master

See merge request !41
parents cd2ac1c0 19b566b2
Pipeline #1196 passed with stage
in 1 minute and 57 seconds