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

[Harald Sitter]

Git commit 463e7c7e6e879f5f6605b59af9db2519f16e4178 by Harald Sitter.
Committed on 29/03/2021 at 06:55.
Pushed by sitter into branch 'Neon/stable'.

Merge branch 'Neon/release' into Neon/stable

M  +1    -0    etc/os-release

https://invent.kde.org/neon/forks/base-files/commit/463e7c7e6e879f5f6605b59af9db2519f16e4178

diff --cc etc/os-release
index e033224,d82ef31..a92bb9f
--- a/etc/os-release
+++ b/etc/os-release
@@@ -1,9 -1,10 +1,10 @@@
  NAME="KDE neon"
 -VERSION="5.21"
 +VERSION="Testing Edition"
  ID=neon
  ID_LIKE="ubuntu debian"
 -PRETTY_NAME="KDE neon User Edition 5.21"
 -VARIANT="User Edition"
 -VARIANT_ID=user
 +PRETTY_NAME="KDE neon Testing Edition"
 +VARIANT="Testing Branches"
++VARIANT_ID=testing
  VERSION_ID="20.04"
  HOME_URL="https://neon.kde.org/"
  SUPPORT_URL="https://neon.kde.org/"