[X2Go-Commits] [live-build-x2go] 20/186: Merge branch 'feature/openbox' into feature/mate-minidesktop

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 a48ab17d3924adffa32df88f1e6aa20037342675 Merge: e4c25ea 95d8054 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Feb 6 15:56:49 2018 +0100 Merge branch 'feature/openbox' into feature/mate-minidesktop .../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