From e7409b265cfe15e99f0527c4001c690f1ed905b0 Mon Sep 17 00:00:00 2001
From: David Mehren
Date: Mon, 21 Dec 2020 21:28:53 +0100
Subject: Merge release notes of 1.7.0-rc1 and rc2 into 1.7.0

Signed-off-by: David Mehren <git@herrmehren.de>
---
 public/docs/release-notes.md | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'public')

diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md
index d95a8d4f..ad617f2e 100644
--- a/public/docs/release-notes.md
+++ b/public/docs/release-notes.md
@@ -1,14 +1,6 @@
 # Release Notes
 
-## <i class="fa fa-tag"></i> 1.7.0-rc2 <i class="fa fa-calendar-o"></i> 2020-12-02
-Changes since 1.7.0-rc1:
-
-### Bugfixes
-- Fix crash when OAuth2 config parameters are missing (thanks to [@vberger](https://github.com/vberger) for reporting!)
-- Handle broken `SequelizeMeta` table on MySQL/MariaDB (thanks to [@titulebolide](https://github.com/titulebolide) for reporting!)
-
-
-## <i class="fa fa-tag"></i> 1.7.0-rc1 <i class="fa fa-calendar-o"></i> 2020-11-29
+## <i class="fa fa-tag"></i> 1.7.0 <i class="fa fa-calendar-o"></i> 2020-12-21
 
 We have renamed to HedgeDoc!
 Many thanks to [Éric Gaspar](https://github.com/ericgaspar/) who designed our new logo!
@@ -39,6 +31,8 @@ This is probably the last release in the 1.x series. Stay tuned for 2.0, schedul
 - Fix broken redirect on login
 - CSS fixes for slide mode
 - Do not create new notes with `null` as content
+- Fix crash when OAuth2 config parameters are missing (thanks to [@vberger](https://github.com/vberger) for reporting!)
+- Handle broken `SequelizeMeta` table on MySQL/MariaDB (thanks to [@titulebolide](https://github.com/titulebolide) for reporting!)
 
 ### Contributors
 - [Adam Worley](https://github.com/AdamWorley)
-- 
cgit v1.2.3