[X2Go-Commits] [live-build-x2go] 23/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 7a30878c7a2785ad34c43facf00dcb0cacb313f9
Merge: aaaceec 5258aff
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jan 16 02:44:06 2018 +0100

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

 .../lib/live/config/2900-x2go-thinclientconfig     | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

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