[X2Go-Commits] [live-build-x2go] 13/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 afca46ea93c8e3423d2a83b1ddf00cbcffd31808
Merge: 778171f a8afba5
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Feb 6 12:21:40 2018 +0100

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

 .../lib/live/config/2260-getsshhostkeysfrommedia   | 157 ++++++++++++---------
 .../lib/live/config/2270-getsshclientkeysfrommedia | 113 ++++++++-------
 2 files changed, 155 insertions(+), 115 deletions(-)

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