[shotcut/f26: 2/2] Merge branch 'master' into f26
commit 6de647f7a8a220e387280f6627ac6c53d778fcb3
Merge: 8390aa7 b0b5377
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 11:52:40 2017 +0100
Merge branch 'master' into f26
shotcut.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---