]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 Jun 2017 19:51:52 +0000 (22:51 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 Jun 2017 19:51:52 +0000 (22:51 +0300)
* 'master' of git.php.net:php-src:
  code de-duplication in ReflectionType::__toString and ReflectionNamedType::getName


Trivial merge