[xpra-codecs-freeworld/f26: 7/7] Merge branch 'master' into f26
commit 9b90a5fd41d9226219bf27e3f2b0b956860e80c1
Merge: 6ccc940 bf26e81
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Mar 20 18:39:37 2018 +0100
Merge branch 'master' into f26
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 32 +++++++++++++++++++++++++++-----
3 files changed, 29 insertions(+), 6 deletions(-)
---