]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Fri, 12 Aug 2016 08:25:18 +0000 (16:25 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 12 Aug 2016 08:25:18 +0000 (16:25 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Fix URL rewriter partially
  Support "git worktree"


Trivial merge