This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-stretch in repository live-build-x2go. commit 192b6332cd777fb0e9ef9cff16ce4e87c0fe01c2 Merge: fa3b7aa fa886d5 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 09:20:00 2018 +0100 Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-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