[X2Go-Commits] [live-build-x2go] 21/95: Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.

commit 1da830a09a31b0544eb8c73fd110136b9d1a5aed
Merge: cdd08b5 b140c1c
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Feb 9 22:10:10 2018 +0100

    Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround

 .../lib/live/config/2260-getsshhostkeysfrommedia             | 12 ++++++------
 .../lib/live/config/2270-getsshclientkeysfrommedia           |  8 ++++----
 .../lib/live/config/2280-x2go-getportableappsessions         |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git