[X2Go-Commits] [live-build-x2go] 16/115: Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch

[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-stretch
in repository live-build-x2go.

commit 4f3a9bdf3da823ce4ffe84085b02051207bb523a
Merge: 68b3cbd 93322eb
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 4 13:03:38 2018 +0100

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

 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia   | 2 +-
 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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