[X2Go-Commits] [live-build-x2go] 21/186: Merge branch 'feature/openbox' into feature/mate-minidesktop-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/mate-minidesktop-stretch
in repository live-build-x2go.

commit d2b9a23cffadda55127769de3ce8d21c41f022b9
Merge: 457cdb6 95d8054
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Feb 6 15:56:55 2018 +0100

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

 .../lib/live/config/2260-getsshhostkeysfrommedia               | 10 +++++-----
 .../lib/live/config/2270-getsshclientkeysfrommedia             |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

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