php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Dmitry Stogov
2020-10-27 16:42:26 +03:00
parent 1f1dbd7f48
commit c80cb79796
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
-7
View File
@@ -1,13 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
<<<<<<< HEAD
?? ??? ????, PHP 8.1.0alpha1
=======
?? ??? ????, PHP 8.0.0RC4
29 Oct 2020, PHP 8.0.0RC3
>>>>>>> PHP-8.0
- FTP:
. Convert resource<ftp> to object \FTPConnection. (Sara)