From 92f90b6b7528ed435def0314a6f0baf915dd4a16 Mon Sep 17 00:00:00 2001 From: Mateusz Zalewski Date: Wed, 2 Nov 2022 13:42:15 +0100 Subject: [PATCH 1/2] Mention 1.5 branch in README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dfd715ed..fe5385fd 100644 --- a/README.md +++ b/README.md @@ -48,5 +48,6 @@ Sylius Core Team’s plugin for [PayPal Commerce Platform](https://www.paypal.co #### Supported branches * `1.3` (v1.3.*) - security fixes -* `1.4` (v1.4.*) - bug fixes, improvements -* `master` (v1.5.*) - new features +* `1.4` (v1.4.*) - bug fixes +* `1.5` (v1.5.*) - bug fixes, improvements +* `master` (v1.6.*) - new features From dd190f1326d209571fce3b7539955a19862c8806 Mon Sep 17 00:00:00 2001 From: Mateusz Zalewski Date: Wed, 2 Nov 2022 13:43:00 +0100 Subject: [PATCH 2/2] Mention 1.5 branch in PR template --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e2ffa087..3cc44512 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ | Q | A | --------------- | ----- -| Branch? | 1.3 (security fixes), 1.4 (bug fixes, improvements), master (new features) +| Branch? | 1.3 (security fixes), 1.4 or 1.5 (bug fixes, improvements), master (new features) | Bug fix? | no/yes | New feature? | no/yes | Related tickets | fixes #X, partially #Y, mentioned in #Z