]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 13 Sep 2018 10:38:27 +0000 (13:38 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 13 Sep 2018 10:38:27 +0000 (13:38 +0300)
* 'master' of git.php.net:php-src:
  Fix a typo in a class catch in Phar


Trivial merge