]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc90ddf 6489edb)
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 6 Apr 2016 16:06:40 +0000 (18:06 +0200)
committerAnatol Belski <ab@php.net>
Wed, 6 Apr 2016 16:06:40 +0000 (18:06 +0200)
* PHP-7.0:
  fix merge mistake


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