]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1ef676 72fb941)
Merge branch 'PHP-7.1'
authorMatteo Beccati <mbeccati@php.net>
Thu, 15 Dec 2016 08:32:26 +0000 (09:32 +0100)
committerMatteo Beccati <mbeccati@php.net>
Thu, 15 Dec 2016 08:32:26 +0000 (09:32 +0100)
commitd060060c08fd3158f99fb9f9adfccf49978661d8
tree357281ea56a1815fb0bd2543cf700b4e7530c782tree | snapshot
parente1ef67625a205a34ec91d1a8958278ac129d1639commit | diff
parent72fb941bd47aeaa8fd4100aacc945e5372984ac2commit | diff
Merge branch 'PHP-7.1'

* PHP-7.1:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.
ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt diff1 | diff2 | blob | history
ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.