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

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 7178de5eb2e0daba8ef67e8ce7244202aaf9eb27 Merge: d8a9280 93322eb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Feb 4 13:04:17 2018 +0100 Merge branch 'feature/openbox' into feature/mate-minidesktop-stretch config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git