Commit 5486fe2c authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Marge latest devel into master

See merge request oliver/ivatar!141
parents 02aba96a f86c9bae
Pipeline #1514 passed with stage
in 6 minutes and 39 seconds