From 4ec0cafd4a22a48762e57dd303f8b343fc296c85 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 23 Jun 2021 22:35:14 +0200
Subject: [PATCH] Update the changelog for 2.0rc1
(cherry picked from commit e039025b02dcba6a9c9bf428fc423bcfe2cc5392)
---
CHANGELOG.rst | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c883d61a..baf42bfa 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,14 +6,21 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
-Unreleased
+`2.0rc1`_ - 2021-06-23
+----------------------
+
+Changed
+~~~~~~~
+
+* Use semantically correct html elements for headings and alerts.
+
+`2.0b3`_ - 2021-06-16
----------
Changed
~~~~~~~
* Use a more speaking name for preference section ("Timetables" instead of "Chronos").
-* Use semantically correct html elements for headings and alerts.
Fixed
~~~~~
@@ -178,3 +185,8 @@ Fixed
.. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b0
.. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b1
.. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
+<<<<<<< HEAD
+=======
+.. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
+.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
+>>>>>>> e039025 (Update the changelog for 2.0rc1)
--
GitLab