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 07d8986789f9e965c27b788713f87f0cb3b08247 Merge: 7bf0268 40a6269 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Thu Nov 30 22:36:11 2017 +0100 Merge branch 'feature/mate-minidesktop' into feature/mate-minidesktop-stretch Conflicts: config/package-lists/mate-minidesktop.list.chroot .../lib/live/config/2900-firefox-config | 27 +++++++ config/package-lists/firefox-langpacks.list.chroot | 93 ++++++++++++++++++++++ config/package-lists/mate-minidesktop.list.chroot | 1 - 3 files changed, 120 insertions(+), 1 deletion(-) diff --cc config/package-lists/mate-minidesktop.list.chroot index 43fe0f2,4ec56a6..758b6f7 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@@ -1,4 -1,4 +1,3 @@@ firefox-esr - firefox-esr-l10n-de -flashplugin-nonfree x2gothinclient-minidesktop x2gothinclient-usbmount -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git