[X2Go-Commits] [live-build-x2go] 29/42: Merge branch 'feature/openbox' into feature/openbox-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 0d3be542c3338af98c66173fdaf5f81ddf9c2c2a
Merge: 60885b3 b68cac2
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jan 16 07:52:04 2018 +0100

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

 config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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