diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index be67d08896bee..4df560490fdea 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,11 +32,15 @@ before it will be accepted, we ask that you follow these simple guidelines: Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code. #### Branches -Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.2-dev`. + +Joomla 5.4 is in security maintenance mode until 12th October 2027, which means it will only receive security fixes. +Bug fixing PRs should be made to the `6.2-dev` branch. Merged bugfixes will be upmerged into the current branches. +New features that do not break backwards compatibility should be made to the `6.3-dev` branch, otherwise they should +be made to the `7.0-dev` branch. | Branch | Purpose | |---------|--------------------------------------------------------------------------------------------------------------| -| 5.4-dev | Branch for the current 5.x Joomla version. | -| 6.1-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.1 go into this branch. | -| 6.2-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch. | +| 5.4-dev | Branch for the current 5.x Joomla version. Currently in security maintenance mode. | +| 6.2-dev | Branch for the current 6.x Joomla version. Bugfixes go into this branch. | +| 6.3-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch. | | 7.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |