Merge branch '1.6' into 1.7

* 1.6: Update PR template Update supported branches in README file
Sylius · Apr 26, 2024 · f8c6f14 · f8c6f14
2 parents e778a8e + a2a6bbd
commit f8c6f14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 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 or 1.5 (bug fixes, improvements), master (new features)
+| Branch?         | 1.5 (security fixes), 1.6 (bug fixes, improvements), 1.7 (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
@@ -51,7 +51,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
-* `1.5` (v1.5.*) - bug fixes, improvements
-* `master` (v1.6.*) - new features
+* `1.5` (v1.5.*) - security fixes
+* `1.6` (v1.6.*) - bug fixes, improvements
+* `1.7` (v1.7.*) - new features