[X2Go-Commits] [live-build-x2go] 12/94: 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/openbox-stretch
in repository live-build-x2go.

commit 778171f0286c1687769b2721b614594232b92676
Merge: ae1a5ee 7658766
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 4 17:57:53 2018 +0100

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

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

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