[X2Go-Commits] [live-build-x2go] 24/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 04ff3d6f9889d7ec589b58e6947f57b8da88c41a
Merge: 6f855af e926958
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 11 00:33:02 2018 +0100

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

 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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