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

git-admin at x2go.org git-admin at x2go.org
Wed Jan 24 18:11:43 CET 2018


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 b308b1f7397afac4b398a13a2a581eb5190e6233
Merge: 40d4379 cbb7b43
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jan 24 10:44:59 2018 +0100

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

 config/includes.chroot/lib/live/config/2000-settime | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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


More information about the x2go-commits mailing list