Welcome 2020.12-dev

diff --git a/CHANGELOG b/CHANGELOG
index 4eeb7262507042638faf2836413a205ad6a6e022..f64ec6cfeb239e12b48bb7b1f379a3c69c191840 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 2020.12 (unreleased)
+  Friendica Core:
+    Enhanced forum delivery using attached mention tags [redmatrix]
+    Enhanced code testability [nupplaphil]
+    Added phpseclib dependency to replace standalone ASN1 library [nupplaphil]
+
 Version 2020.09 (2020-09-20)
   Friendica Core:
     Updates to the translations: DE, EN GB, EN US, ES, FR, IT, NL, PL, RU, ZH_CN [translation teams]

diff --git a/VERSION b/VERSION
index 14ffed05b5f874acbd3d2f04c40c21229224255b..682a8d1fba26f4e21658bd5c69d332cf6de442dc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2020.09
+2020.12-dev

diff --git a/boot.php b/boot.php
index cba94fa483f8467bf4633e19bcd7983d98277da8..af08d5443669b34c840aa94835b0973c9883b733 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Red Hot Poker');
-define('FRIENDICA_VERSION',      '2020.09');
+define('FRIENDICA_VERSION',      '2020.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 

diff --git a/database.sql b/database.sql
index 3b7ef341c1d541759dc160c4732d8c9c4d268403..fe957552e77be1f0b70b6c207d754266420d49c3 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
 -- ------------------------------------------
--- Friendica 2020.09-rc (Red Hot Poker)
+-- Friendica 2020.12-dev (Red Hot Poker)
 -- DB_UPDATE_VERSION 1368
 -- ------------------------------------------