[X2Go-Commits] [live-build-x2go] 17/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 f3863e5cd85c193eb31fe7603a5f622941f13700
Merge: 2e6f759 b4fe579
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jan 13 12:06:33 2018 +0100

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

 config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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