Commit f378360d authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Merge branch 'master' of...

Merge branch 'master' of gitlab.switch.ch:memoriav/memobase-2020/services/postprocessing/media-converter
parents 37b13119 1f7d548f
Pipeline #45553 passed with stages
in 8 minutes and 54 seconds