]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a48030 b94f678)
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sun, 18 Oct 2015 22:44:59 +0000 (15:44 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Oct 2015 22:44:59 +0000 (15:44 -0700)
* PHP-5.6:
  Skip serialize test if ext/session is not loaded

Conflicts:
ext/standard/tests/serialize/bug70219_1.phpt


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