]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Wed, 11 Oct 2017 16:24:29 +0000 (18:24 +0200)
committerAnatol Belski <ab@php.net>
Wed, 11 Oct 2017 16:24:29 +0000 (18:24 +0200)
* PHP-7.2:
  Upgrade bundled libmagic to 5.31


Trivial merge