[Merge] ~edubuntu-dev/ubuntu-cdimage:main into ubuntu-cdimage:main

[Erich Eickmeyer]

Hehe, no worries. Most of the technique used when doing this was a merge from the state before the removal last May, so that was just moldy leftovers.

Diff comments:

> diff --git a/etc/qa-products b/etc/qa-products
> index ea32841..a778d1c 100644
> --- a/etc/qa-products
> +++ b/etc/qa-products
> @@ -1,5 +1,9 @@
>  # QA PRODUCT								PROJECT		IMAGE_TYPE		PUBLISH_TYPE					ARCHITECTURE	TRACKER
>  
> +# Edubuntu
> +Edubuntu Desktop amd64							edubuntu	daily-live			desktop					amd64			iso
> +Edubuntu Desktop i386							edubuntu	daily-live			desktop					i386			iso

Sorry, I think I had the wrong decade. :)

> +
>  # Kubuntu
>  Kubuntu Desktop amd64						kubuntu			daily-live			desktop					amd64			iso
>  Kubuntu Desktop amd64+mac					kubuntu			daily-live			desktop					amd64+mac		iso


-- 
https://code.launchpad.net/~edubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/437167
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/ubuntu-cdimage:main.