From 84a463403da1c81afbcedda8f0e788c78bd25a79 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 5 Jun 2019 13:17:07 +0200 Subject: [PATCH] prepared the 2.11.2 release --- CHANGELOG | 2 +- composer.json | 2 +- src/Environment.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1d6bc7d80..0468803ba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 2.12.0 (2019-XX-XX) +* 2.11.2 (2019-06-05) * fixed macro auto-import diff --git a/composer.json b/composer.json index c93fa5ec8..b0c5836f8 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.12-dev" + "dev-master": "2.11-dev" } } } diff --git a/src/Environment.php b/src/Environment.php index 2d2bc6fbb..926ce1a05 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '2.12.0-DEV'; - const VERSION_ID = 21200; + const VERSION = '2.11.2'; + const VERSION_ID = 21102; const MAJOR_VERSION = 2; - const MINOR_VERSION = 12; - const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const MINOR_VERSION = 11; + const RELEASE_VERSION = 2; + const EXTRA_VERSION = ''; private $charset; private $loader;