[X2Go-Commits] [live-build-x2go] 68/186: Merge branch 'feature/openbox' into feature/mate-minidesktop

[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 177db3f01a33f69c002e35c0b7767715b90e6895
Merge: e73c694 dce43db
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Apr 22 19:08:20 2018 +0200

    Merge branch 'feature/openbox' into feature/mate-minidesktop

 config/includes.chroot/lib/live/config/2600-tcpprint | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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