]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Wed, 19 Apr 2017 09:18:19 +0000 (17:18 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 19 Apr 2017 09:18:19 +0000 (17:18 +0800)
* 'master' of git.php.net:/php-src:
  Enable more control over travis/compile.sh


Trivial merge