]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/3274'
authorStanislav Malyshev <stas@php.net>
Tue, 19 Jun 2018 23:50:16 +0000 (16:50 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Jun 2018 23:50:16 +0000 (16:50 -0700)
* pull-request/3274:
  Added const modifier
  76363: added jsm extension to list of mime types


Trivial merge