]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Mon, 15 Jan 2018 13:34:03 +0000 (21:34 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 15 Jan 2018 13:34:03 +0000 (21:34 +0800)
commit92d6f26e3f8b02220ccfcdd735cf4310ae1a7c8f
tree209050aae7105d75a9226070107abc68bf7beed0
parent56d2147cbb65fdcb3d77f368ec9dd7685193d146
parent89463341c8f2f9691733a2ee11b3ce8121cc74b6
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Allow pecl like usage in ext/phar, closes #2955