From 4a15c5fcfe3ca3010bafcb067f5ac698de827055 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 20 Sep 2020 15:40:56 -0400 Subject: [PATCH] Welcome 2020.12-dev --- CHANGELOG | 6 ++++++ VERSION | 2 +- boot.php | 2 +- database.sql | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4eeb726250..f64ec6cfeb 100644 --- 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 14ffed05b5..682a8d1fba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2020.09 +2020.12-dev diff --git a/boot.php b/boot.php index cba94fa483..af08d54436 100644 --- 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 3b7ef341c1..fe957552e7 100644 --- 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 -- ------------------------------------------