Commit d7f5b2f7 authored by Robert Palm's avatar Robert Palm

Merge branch 'flairs' into 'master'

Flairs

See merge request !155
parents 4c192862 a9a0c14c
Pipeline #52646 passed with stages
in 3 minutes and 15 seconds