Merge ~lubuntu-dev/ubuntu-seeds/+git/lubuntu:lp.1730159 into ~lubuntu-dev/ubuntu-seeds/+git/lubuntu:disco

[Steve Langasek]

[Simon Quigley (tsimonq2)]

Feel free to merge.

review: Approve

diff --git a/blacklist b/blacklist
index bdf4aa0..6393cdd 100644
--- a/blacklist
+++ b/blacklist
@@ -6,8 +6,3 @@
 network-manager-config-connectivity
 network-manager-config-connectivity-ubuntu
 network-manager-config-connectivity-debian
-
-# snapd automatically uses a bit of RAM, and Lubuntu doesn't plan on ever installing
-# Snaps by default, so let's not even put it on the ISO, people can install it if they
-# want it...
-snapd
diff --git a/supported b/supported
index edd1ec0..745cc24 100644
--- a/supported
+++ b/supported
@@ -40,7 +40,6 @@ included due to matching Extra-Include patterns, and has no other effect):
  * Extra-Exclude: libgl1-mesa-dri-experimental-dbg # LP: #638097
  * Extra-Exclude: python-vigra-doc # libvigraimpex is in main, but nothing uses python-vigra
  * Extra-Exclude: libunity-*-dev unity-2d-dbg
- * Extra-Exclude: snapd
 
 
 Transitional packages: