Commit cb17a7b3 authored by Masterdubs's avatar Masterdubs

Merge branch 'master' into 'master'

Master

See merge request !164
parents 1a0afd3e b33caaca
Pipeline #256 passed with stages
in 51 seconds