From 248a7fa48a161aedf619dd9a36718775c9a2677f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 30 Mar 2020 10:46:54 -0400 Subject: [PATCH] Welcome 2020.06-dev! --- CHANGELOG | 9 +++++++++ VERSION | 2 +- boot.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 19edb6ecaa..197b2bca05 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +Version 2020.06 (unreleased) + Friendica Core: + + Friendica Addons: + showmore_dyn: + New addon to collapse long post depending on their actual height [wiwie] + + Closed Issues: + Version 2020.03 "Red Hot Poker" (2020-03-30) Friendica Core: Updates to the translations (DE, FR, JA, NL, PL, RU, ZH-CN) [translation teams] diff --git a/VERSION b/VERSION index d8ba5c6c21..51ae1fea5c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2020.03 +2020.06-dev diff --git a/boot.php b/boot.php index 17126fd387..348e1b2c41 100644 --- a/boot.php +++ b/boot.php @@ -39,7 +39,7 @@ use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Red Hot Poker'); -define('FRIENDICA_VERSION', '2020.03'); +define('FRIENDICA_VERSION', '2020.06-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_UPDATE_ROUTINE_VERSION', 1170);