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 3642dd8544899552b9f2a9903dd267653beb51a8 Merge: cfa56bf 2033043 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Mar 19 17:31:49 2019 +0100 Merge commit '20330433d1023a28a71e3a962c076d4fef73d5c5' into feature/mate-minidesktop-stretch Conflicts: config/package-lists/mate-minidesktop.list.chroot config/package-lists/mate-minidesktop.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --cc config/package-lists/mate-minidesktop.list.chroot index 758b6f7,159f71b..8ec3af1 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@@ -1,3 -1,5 +1,4 @@@ firefox-esr -flashplugin-nonfree + mate-media 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