]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58b2344 b947aff)
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 20:46:15 +0000 (21:46 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 20:46:15 +0000 (21:46 +0100)
* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
ext/session/tests/bug69111.phpt


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