]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Sun, 15 Nov 2015 18:02:21 +0000 (19:02 +0100)
committerAnatol Belski <ab@php.net>
Sun, 15 Nov 2015 18:02:21 +0000 (19:02 +0100)
* PHP-7.0:
  Fixed bug #70917 install-pear-nozlib.phar missing
  Update mime type generator script to keep track of additional mime-types
  Added support for CSS/JavaScript source maps


Trivial merge