[X2Go-Commits] [live-build-x2go] 60/186: 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-stretch
in repository live-build-x2go.

commit 4c80e0663ea75f9fd716848e96ddf7887120a087
Merge: f26ce02 d78d191
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Feb 19 11:28:27 2018 +0100

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

 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 4 ++--
 1 file 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