[X2Go-Commits] [live-build-x2go] 10/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 ae4231f26e5e1a99a30c409f49c2eb96ecc53e86
Merge: 3ad2f53 d2a4a1f
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Feb 3 15:02:06 2018 +0100

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

 .../lib/live/config/2270-getsshclientkeysfrommedia                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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