Commit 6eb94b42 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch 'audiomix' into 'master'

Audiomix merge

See merge request kde/kdenlive!60
parents 0ce0f757 9f3c1670
Pipeline #8798 passed with stage
in 18 minutes and 28 seconds