]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:44:50 +0000 (11:44 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:44:50 +0000 (11:44 +0800)
commitc32281d4066b6b860192b1c83049659fbd8bdcbc
treee22f90b0a47cb164564a073c2e99482f8a50d347
parent3144222c7b21b52b3f44f8ae392a6943d189961f
parent341ff7119f0c8291f6617fea5c60d19a4eb22336
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)