Skip to content
Commit 91ea8545 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'teuto/6084-global-conf-variable' into 'develop' 

fixes #6084

Closes #6084

See merge request !1425
parents 52adda3f e9a9ad0f
Pipeline #8697 passed with stage
in 12 seconds