]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 23 Feb 2018 10:28:16 +0000 (11:28 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 23 Feb 2018 10:29:21 +0000 (11:29 +0100)
commitc6cf3d4ada79830fab28778aedb15af66bf238ab
tree458131a8e050bfc068cbada0c454170ac07b3380
parent2577cdbea2d8c6accd0cb311ee4490ee24d637fd
parent0b8cfa6c786536947cfa0be1aad0e396096aded7
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix some arginfos
NEWS
ext/ftp/php_ftp.c
ext/openssl/openssl.c
ext/standard/basic_functions.c