[obs-studio/f26: 2/2] Merge branch 'master' into f26
commit 88143519bbd808ff6da9960361ed865fcd149ead
Merge: 4ccfa71 e70776a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Mar 31 10:06:41 2018 +0100
Merge branch 'master' into f26
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---