Merge branch '1.4' into 1.5

* 1.4: Mention 1.5 branch in PR template Mention 1.5 branch in README
Sylius · Nov 22, 2022 · 3e5001c · 3e5001c
2 parents 8d63745 + 6862ed6
commit 3e5001c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
diff --git 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