Commit 09ade15b authored by Philipp Schafft's avatar Philipp Schafft

Merge branch 'update-conf'

parents de6e8b41 1fd17b0b
Pipeline #328 failed with stage
in 12 seconds