]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 3 Dec 2020 09:56:53 +0000 (10:56 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 3 Dec 2020 10:01:57 +0000 (11:01 +0100)
commit0f6c41c6f8ea434a820fbd6f4fccc214bdae939e
tree0bb549a000d666d2c4e6d71a0a8f36b35d85e5f5
parent5d5c1cea5f80e5ab2c2abe157d3f369d9a105dce
parent0697a64f7eb99780e32414c43b6139001e4cc3eb
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix mysqli_expire_password test for mariadb
ext/mysqli/tests/mysqli_expire_password.phpt