]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3144222 341ff71)
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)
* PHP-7.0:
  Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.