From 793195c835f5eb90d93700c1d27863f90dbb7ece Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 Sep 2019 21:12:52 +0200
Subject: [PATCH 1/2] CHANGELOG 1st steps of 2019.12

---
 CHANGELOG | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0121e1d5f..97516ac66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Version 2019.12-dev (unreleased)
+  Friendica Core:
+    Enhanced the manage functionality [annando]
+    Fixed some problems with the remote auth functionality [annando]
+    Added router configuration file [nupplaphil]
+    Added drone.io as CI service [nupplaphil]
+
+  Friendica Addons:
+
+  Closed Issues:
+    1071, 7548, 7657, 7681
+
 Version 2019.09 (2019-09-29)
   Friendica Core:
     Update to the translations (CS, DE, EN GB, EN US, FR, JA, NL, PL) [translation teams]

From d85926986453a31e63189e910b6c141ae0b2345c Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 Sep 2019 21:17:56 +0200
Subject: [PATCH 2/2] added mailstream stuff by mexon

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 97516ac66..9f253c810 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,11 @@ Version 2019.12-dev (unreleased)
     Added drone.io as CI service [nupplaphil]
 
   Friendica Addons:
+    mailstream:
+      Support for new img format was added [mexon]
+      BB Code is now included as plaintext [mexon]
+      Logging format is enhanced [mexon]
+      ActivityPub "announce" notifications are not included [mexon]
 
   Closed Issues:
     1071, 7548, 7657, 7681