[X2Go-Commits] [live-build-x2go] 09/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 3119ca119a3cc14adc3d3c67800deabcb6d82b6c
Merge: d4e85fc d2a4a1f
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Feb 3 15:02:04 2018 +0100

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

 .../lib/live/config/2270-getsshclientkeysfrommedia                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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