[shotcut/f26: 2/2] Merge branch 'master' into f26
commit d62a5b6213af570f9bfc74fe59385ff2050bb45e
Merge: 9f1a0d9 130b675
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Mon Jan 8 19:34:06 2018 +0100
Merge branch 'master' into f26
.gitignore | 1 +
shotcut.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---