GitLab

Related to !211

Fixes #1047

When dropping an effect on an AV group, apply effect on correct part even if audio effect is dropped on video
Related to #1047

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 371062

Farid Abdelnour authored Apr 13, 2021 and Julius Künzel committed Apr 15, 2021

(cherry picked from commit 30a98e03)

(cherry picked from commit 14134a11)

Eugen Mohr authored Apr 13, 2021 and Julius Künzel committed Apr 13, 2021

Adding @class tag. Move the class definition before the class itself and remove whitespace before the class to show @brief text on Visual Studio. Add @todo tag for not defined class.