From 0b4ba691fb99ec7952d25deb36c0a83061b93bbf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 10 Mar 2021 11:05:55 +0100 Subject: [PATCH 1/2] Prepare the 2.14.4 release --- CHANGELOG | 2 +- src/Environment.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ce2f00ebb..d4f7f114d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -# 2.14.4 (2021-XX-XX) +# 2.14.4 (2021-03-10) * Add the slug filter diff --git a/src/Environment.php b/src/Environment.php index d7b91278e..7627af0e7 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '2.14.4-DEV'; + const VERSION = '2.14.4'; const VERSION_ID = 21404; const MAJOR_VERSION = 2; const MINOR_VERSION = 14; const RELEASE_VERSION = 4; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; private $charset; private $loader; From 37e48403c21e06f63bc27d7ccd997fbb72b0ae2a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 10 Mar 2021 11:07:14 +0100 Subject: [PATCH 2/2] Bump version --- CHANGELOG | 4 ++++ src/Environment.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d4f7f114d..0e4c16df8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +# 2.14.5 (2021-XX-XX) + + * n/a + # 2.14.4 (2021-03-10) * Add the slug filter diff --git a/src/Environment.php b/src/Environment.php index 7627af0e7..d25208d60 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '2.14.4'; - const VERSION_ID = 21404; + const VERSION = '2.14.5-DEV'; + const VERSION_ID = 21405; const MAJOR_VERSION = 2; const MINOR_VERSION = 14; - const RELEASE_VERSION = 4; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 5; + const EXTRA_VERSION = 'DEV'; private $charset; private $loader;