[X2Go-Commits] [live-build-x2go] 03/18: Merge branch 'feature/openbox' into feature/mate-minidesktop

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

commit cd669f5fa86a15d0c41629f182644a1fbc9aa496
Merge: 40a6269 58cc432
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Wed Dec 6 19:12:18 2017 +0100

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

 .../lib/live/config/2270-getsshclientkeysfrommedia | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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