[obs-studio/f27: 2/2] Merge branch 'master' into f27
commit 2686e5bce9350b0663e236f95f362069a20fe99c
Merge: ae63e3a e70776a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Mar 31 10:06:13 2018 +0100
Merge branch 'master' into f27
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---