[X2Go-Commits] [live-build-x2go] 59/186: 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 c26d73cadea68c413ab482f41808a5be6fb8b970
Merge: 19a161e ca0877d
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 18 22:29:18 2018 +0100

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

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

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