[xpra-codecs-freeworld/f25: 2/2] Merge branch 'master' into f25
commit 661cebfb607a604f5ac0751d4bf5a111ed6228fb
Merge: 4b5af3f f01cdd5
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Sep 27 12:37:50 2017 +0200
Merge branch 'master' into f25
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---