]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 382ec5c 7c696fa)
Merge branch 'PHP-7.0' into PHP-7.1
authorMatteo Beccati <mbeccati@php.net>
Thu, 15 Dec 2016 08:32:04 +0000 (09:32 +0100)
committerMatteo Beccati <mbeccati@php.net>
Thu, 15 Dec 2016 08:32:04 +0000 (09:32 +0100)
* PHP-7.0:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.