[X2Go-Commits] [live-build-x2go] 35/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 0c25eaf71b269d8b11de9d0504307b424a0d57ea
Merge: 2c524c0 9e25b7d
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Jan 19 14:28:16 2018 +0100

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

 .../lib/live/config/2900-x2go-thinclientconfig     | 55 ++++++++++++----------
 1 file changed, 29 insertions(+), 26 deletions(-)

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