From 00926df60152068e7040fe78ef2b80cadbfba901 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 31 Jan 2020 20:13:00 +0100
Subject: [PATCH] Update changelog

---
 CHANGELOG.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f586217c4..b4b9662b7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+
+`2.0a1`_
+--------
+
+New features
+~~~~~~~~~~~~
+
+* Migrate to materialize.css
+* Dashboard
+* Notifications via SMS (Twilio), Email, Webpush or on the dashboard
+* Admin interface
+* Background Tasks with Celery
+
+Bug fixes
+~~~~~~~~~
+
+* setup_data no longer forces database connection
+
 `1.0a4`_
 --------
 
@@ -53,3 +71,4 @@ Minor changes
 _`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a1
 _`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a2
 _`1.0a4`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a4
+_`2.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/2.0a1
-- 
GitLab