From a49729a790a673ee74b8606ee66726a64521e12d Mon Sep 17 00:00:00 2001 From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:17:55 +0200 Subject: [PATCH 1/4] Back to devel --- docs/HISTORY.txt | 3 +++ eea/volto/policy/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index f8361cb..cea798b 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +3.4-dev0 - (unreleased) +--------------------------- + 3.3 - (2024-03-28) --------------------------- * Bug fix: fixed the ZMI styles diff --git a/eea/volto/policy/version.txt b/eea/volto/policy/version.txt index eb39e53..8b95c3e 100644 --- a/eea/volto/policy/version.txt +++ b/eea/volto/policy/version.txt @@ -1 +1 @@ -3.3 +3.4-dev0 From 521dc6c73428b5ea780e6dc06177397c29f543da Mon Sep 17 00:00:00 2001 From: Alexandru Ghica Date: Thu, 28 Mar 2024 20:38:51 +0200 Subject: [PATCH 2/4] fixed typo --- eea/volto/policy/overrides.zcml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/volto/policy/overrides.zcml b/eea/volto/policy/overrides.zcml index b532695..f77d037 100644 --- a/eea/volto/policy/overrides.zcml +++ b/eea/volto/policy/overrides.zcml @@ -1,7 +1,7 @@ Date: Thu, 28 Mar 2024 20:45:03 +0200 Subject: [PATCH 3/4] Updated version to 3.4 --- eea/volto/policy/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/volto/policy/version.txt b/eea/volto/policy/version.txt index 8b95c3e..2f4b607 100644 --- a/eea/volto/policy/version.txt +++ b/eea/volto/policy/version.txt @@ -1 +1 @@ -3.4-dev0 +3.4 From 470ebbe0b1ce0a1c2eeaeb22e2ea97eb4178d3d3 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Thu, 28 Mar 2024 20:45:05 +0200 Subject: [PATCH 4/4] Updated changelog - removed develop information --- docs/HISTORY.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index cea798b..f79ec9c 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,10 @@ Changelog ========= -3.4-dev0 - (unreleased) +3.4 - (2024-03-28) --------------------------- +* Change: Develop typo + [alecghica] 3.3 - (2024-03-28) ---------------------------