[X2Go-Commits] [live-build-x2go] 23/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 6f855af02c036901052106107e6a149c2291bb2c
Merge: 5826dff d7eb710
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 11 00:28:36 2018 +0100

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

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

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