From e3ca169db51d4bf17a6685176a4c020cb55f20c9 Mon Sep 17 00:00:00 2001 From: DDEV-Local User Date: Mon, 16 Aug 2021 09:48:24 +0000 Subject: [PATCH] [RELEASE] v12.0.1 --- Build/package.json | 2 +- CHANGELOG.md | 9 +++++++++ Documentation/Settings.cfg | 4 ++-- composer.json | 2 +- ext_emconf.php | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Build/package.json b/Build/package.json index 95b30fa3f..3bea68a10 100644 --- a/Build/package.json +++ b/Build/package.json @@ -5,7 +5,7 @@ "readme": "../README.rst", "homepage": "http://www.bk2k.info", "author": "Benjamin Kott", - "version": "12.0.1-dev", + "version": "12.0.1", "license": "MIT", "devDependencies": { "bootstrap4": "npm:bootstrap@^4.6.0", diff --git a/CHANGELOG.md b/CHANGELOG.md index c9a1bead9..1552c157b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 12.0.1 + +## BUGFIX + +- [BUGFIX] Let image service resolve svgicon - fixes #1042 e763705f +- [REVERT][BUGFIX] Update doctrine usages (#1037) (#1044) 1e8864b4 +- [BUGFIX] Add missing embed css to bootstrap 5 (#1043) c6addb4b +- [BUGFIX] Remove external softref to ext:rtehtmlarea (#1039) 7345b209 + # 12.0.0 ## BREAKING diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index d4e520e93..548b4eb64 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -1,8 +1,8 @@ # coding: utf-8 [general] project = Bootstrap Package -version = 12.0.1-dev -release = 12.0.1-dev +version = 12.0.1 +release = 12.0.1 copyright = since 2014 by Benjamin Kott [html_theme_options] diff --git a/composer.json b/composer.json index 4354c3f05..790238ebe 100644 --- a/composer.json +++ b/composer.json @@ -133,7 +133,7 @@ "app-dir": ".build" }, "branch-alias": { - "dev-master": "12.0.x-dev" + "dev-BP_12-0": "12.0.x-dev" } } } diff --git a/ext_emconf.php b/ext_emconf.php index ca79d114e..bafbe0f63 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -37,5 +37,5 @@ 'author' => 'Benjamin Kott', 'author_email' => 'info@bk2k.info', 'author_company' => 'private', - 'version' => '12.0.1-dev', + 'version' => '12.0.1', ];