summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-12-17 20:01:44 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2019-12-17 20:01:44 +0100
commit2a856049d1bbb87176cbf7ca1499f7bebcd99ffd (patch)
treecf9749157b707dc46bc6878523c744ce9da812b1 /CONTRIBUTING.md
parent26e1f88011e6e392c8d8518f268f09b6f053fbd7 (diff)
parent9458f7e2d819869ed45a2241c635edffee6814e6 (diff)
downloadphp-git-2a856049d1bbb87176cbf7ca1499f7bebcd99ffd.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: More updates to CONTRIBUTING.md
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9474272db5..142244cdf0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -331,7 +331,7 @@ Currently we have the following branches in use:
| Branch | |
| --------- | --------- |
| master | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. |
-| PHP-7.4 | Active development branch for PHP 7.4, which is open for new features and minor internal API changes. |
+| PHP-7.4 | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
| PHP-7.3 | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
| PHP-7.2 | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. |
| PHP-7.1 | This branch is closed. |