[X2Go-Commits] [live-build-x2go] 36/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 9aee64baf6ef419016bec3567a49c98604eab107
Merge: aad3f55 794f384
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Feb 19 12:33:04 2018 +0100

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

 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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