[neon/forks/base-files/Neon/unstable] etc: Merge branch 'Neon/stable' into Neon/unstable

[Harald Sitter]

Git commit 67214d6ddfaa3de4375bceebefc355c3ab7c2b75 by Harald Sitter.
Committed on 29/03/2021 at 06:55.
Pushed by sitter into branch 'Neon/unstable'.

Merge branch 'Neon/stable' into Neon/unstable

M  +1    -0    etc/os-release

https://invent.kde.org/neon/forks/base-files/commit/67214d6ddfaa3de4375bceebefc355c3ab7c2b75

diff --cc etc/os-release
index 3be4911,a92bb9f..0ff1fc5
--- a/etc/os-release
+++ b/etc/os-release
@@@ -1,9 -1,10 +1,10 @@@
  NAME="KDE neon"
 -VERSION="Testing Edition"
 +VERSION="Unstable Edition"
  ID=neon
  ID_LIKE="ubuntu debian"
 -PRETTY_NAME="KDE neon Testing Edition"
 -VARIANT="Testing Branches"
 -VARIANT_ID=testing
 +PRETTY_NAME="KDE neon Unstable Edition"
 +VARIANT="Unstable Branches"
++VARIANT_ID=unstable
  VERSION_ID="20.04"
  HOME_URL="https://neon.kde.org/"
  SUPPORT_URL="https://neon.kde.org/"