]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0631b9e 46de334)
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Wed, 1 Feb 2017 19:05:50 +0000 (19:05 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 1 Feb 2017 19:05:50 +0000 (19:05 +0000)
* PHP-7.1:
  Revert "Inheritance checks should not ignore parents if these implement an interface"
  Revert "Added tests demonstrating the same effect with abstracts"


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