Commit 9a1cbcb1 authored by tec's avatar tec

Merge branch 'master' into 'master'

Master

See merge request !12
parents 53c4f463 21f3bd95
Pipeline #220 failed with stages
in 6 seconds