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

[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 e4c25ea277567930dd5ccdfe00c28e3441440e73
Merge: e27c699 a8afba5
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Feb 6 12:25:55 2018 +0100

    Merge branch 'feature/openbox' into feature/mate-minidesktop
    
    Conflicts:
    	config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig

 .../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