[X2Go-Commits] [live-build-x2go] 04/42: Merge branch 'feature/openbox' into feature/mate-minidesktop-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/mate-minidesktop-stretch
in repository live-build-x2go.

commit 8f866fce0b1588bcd5c89770d970bfdc7f6dc304
Merge: bf32d09 d2b51c8
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Wed Dec 6 20:24:43 2017 +0100

    Merge branch 'feature/openbox' into feature/mate-minidesktop-stretch

 .../lib/live/config/2270-getsshclientkeysfrommedia            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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