]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJulien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 09:33:49 +0000 (10:33 +0100)
committerJulien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 09:33:49 +0000 (10:33 +0100)
* PHP-7.0:
  Update default_mimetype ini setting description


Trivial merge