diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c883d61a08f8242127f5324f1e6204f732942c78..baf42bfa8c74225576adb357adb3d1aab7cb53ab 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)