summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-08-04 22:24:26 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-08-04 22:24:44 +0200
commit0d836a39a71e1c3b97458e8cf4c5e001dcb392d4 (patch)
tree9162892ba62eb84766945f1d68ae137d56c9a58b /CONTRIBUTING.md
parent37a878b8c3fdd47ef5883a7a44a262c1c9909b0a (diff)
downloadphp-git-0d836a39a71e1c3b97458e8cf4c5e001dcb392d4.tar.gz
Revert "Prepare for PHP 8.1"
This reverts commit 1ab4d0e6b7abb67d5a01ce3327bf973772271fb2. This reverts commit a359635cb1a4df8b5137a506c88c4cb102acac0e.
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e5dc7c061..df94bd50e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -327,8 +327,7 @@ Currently we have the following branches in use:
| Branch | |
| --------- | --------- |
-| master | Active development branch for PHP 8.1, which is open for new features and minor internal API changes. |
-| PHP-8.0 | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. |
+| master | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major 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. |