From 65e43e8d049f5ebc5352d2bc34476d1d83a9ff34 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 22 Oct 2020 10:10:15 +0200 Subject: [PATCH 1/2] :wrench: remove .gitflow as we don't have any master branch anymore --- .gitflow | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .gitflow diff --git a/.gitflow b/.gitflow deleted file mode 100644 index 44adde7837..0000000000 --- a/.gitflow +++ /dev/null @@ -1,9 +0,0 @@ -[gitflow "branch"] -master = master -develop = develop -[gitflow "prefix"] -feature = feature/ -release = release/ -hotfix = hotfix/ -versiontag = -support = support/ \ No newline at end of file From 65d6947e52b5519de8ba62d54df2c262a833db7d Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 22 Oct 2020 15:06:48 +0200 Subject: [PATCH 2/2] :bookmark: Prepare 2.7.2 version --- css/css-variables.scss | 2 +- datamodels/2.x/version.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/css-variables.scss b/css/css-variables.scss index 1bfda851db..852edd207a 100644 --- a/css/css-variables.scss +++ b/css/css-variables.scss @@ -17,7 +17,7 @@ */ // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0 -$version: "v2.7.1"; +$version: "v2.7.2"; $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css // Base colors diff --git a/datamodels/2.x/version.xml b/datamodels/2.x/version.xml index dc37380588..85c3a9797f 100755 --- a/datamodels/2.x/version.xml +++ b/datamodels/2.x/version.xml @@ -1,4 +1,4 @@ - 2.7.1 + 2.7.2