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