[X2Go-Commits] [live-build-x2go] 22/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 5826dfff35f55890fd2256b4906f30de671bcccd
Merge: 1ccc1ab 7ef5b46
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Feb 10 20:31:56 2018 +0100

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

 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 6 +++---
 .../includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia  | 6 +++---
 .../lib/live/config/2280-x2go-getportableappsessions                | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

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