Update changelog from 2.12.1

CHANGELOG.rst

@@ -14,15 +14,44 @@ Added
 
 * Notification drawer in top nav bar
 * GraphQL queries and mutations for core data management
-* [Dev] Provide plain PDF template without header/footer for special layouts.
-* Show also group ownerships on person detail page
 
 Changed
 ~~~~~~~
 
 * Rewrite of frontend using Vuetify
-* [Dev] Provide function to generate PDF files from fully-rendered templates.
+
+Removed
+~~~~~~~
+
+* Support for materialize-based frontend views (deprecated in 2.11)
+* Django debug toolbar
+  * It caused major performance issues and is not useful with the new
+    frontend anymore
+
+`2.12.1`_ - 2022-11-06
+----------------------
+
+Fixed
+~~~~~
+
+* An invalid backport caused OIDC clients without PKCD to fail.
+
+`2.12`_ - 2022-11-04
+--------------------
+
+Added
+~~~~~
+
+* Show also group ownerships on person detail page
+* [Dev] Provide plain PDF template without header/footer for special layouts.
+* [Dev] Introduce support for reformattinga and linting JS, Vue, and CSS files.
+
+Changed
+~~~~~~~
+
 * OIDC scope "profile" now exposes the avatar instead of the official photo
+* Language selection on Vue pages now runs via GraphQL queries.
+* [Dev] Provide function to generate PDF files from fully-rendered templates.
 * [Dev] Accept pre-created file object for PDF generation to define
   the redirect URL in advance.
 
@@ -37,14 +66,6 @@ Fixed
 * Invite Person view threw an error when personal invites existed
 * Detailed information for done Celery tasks weren't saved.
 
-Removed
-~~~~~~~
-
-* Support for materialize-based frontend views (deprecated in 2.11)
-* Django debug toolbar
-  * It caused major performance issues and is not useful with the new
-    frontend anymore
-
 `2.11`_ - 2022-08-27
 --------------------
 
@@ -955,3 +976,12 @@ Fixed
 .. _2.10.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.10.1
 .. _2.10.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.10.2
 .. _2.11: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11
+<<<<<<< HEAD
+=======
+.. _2.11.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11.1
+.. _2.12: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12
+<<<<<<< HEAD
+>>>>>>> c48c9201 (Bump version to 2.12)
+=======
+.. _2.12.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12.1
+>>>>>>> 196467bc (Downgrade OAuth toolkit to 1.7.1 and release bugfix)