[X2Go-Commits] [live-build-x2go] 33/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 2c524c020248fb7a5e9cf55d03e5f43ef6803098
Merge: e78d6f7 728c200
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jan 17 06:36:00 2018 +0100

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

 .../lib/live/config/2900-x2go-thinclientconfig          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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