From 0d836a39a71e1c3b97458e8cf4c5e001dcb392d4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 4 Aug 2020 22:24:26 +0200 Subject: Revert "Prepare for PHP 8.1" This reverts commit 1ab4d0e6b7abb67d5a01ce3327bf973772271fb2. This reverts commit a359635cb1a4df8b5137a506c88c4cb102acac0e. --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'CONTRIBUTING.md') 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. | -- cgit v1.2.1