From ce2983523117d8851dc48155be6dfd481d66c95b Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Thu, 3 Mar 2022 13:29:39 +0100 Subject: [PATCH] [Maintenance] Add information about supported branches --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3bb8b941..0b26b518 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ | Q | A | --------------- | ----- -| Branch? | 1.0 (bug fixes, improvements), master (new features) +| Branch? | 1.0 (security fixes), 1.1 (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 index 25d8cf41..112f223e 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,12 @@ App\ProcessManager\CustomAfterRefundProcessManager: Tagged services would be executed according to their priority (descending). +### Supported branches + +* `1.0` (v1.0.*) - security fixes +* `1.1` (v1.1.*) - bug fixes, improvements +* `master` (v1.2.*) - new features + ## Security issues If you think that you have found a security issue, please do not use the issue tracker and do not post it publicly.