Skip to content
GitLab
Explore
Sign in
Multimedia
Kdenlive
Commits
308f4b35
Commit
308f4b35
authored
Dec 28, 2016
by
Jean-Baptiste Mardelle
Browse files
Fix merge mess again
parent
350cadb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment