[obs-studio/f25: 2/2] Merge branch 'master' into f25
commit 67f51ea0df5f58746ac64772cfeb22497a5beff1
Merge: 005a2b2 f8034c4
Author: martinkg(a)fedoraproject.org <martinkg(a)fedoraproject.org>
Date: Tue Oct 17 14:49:21 2017 +0200
Merge branch 'master' into f25
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---