]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)
committerAnatol Belski <ab@php.net>
Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)
* PHP-7.0:
  Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

1  2 
ext/pcre/php_pcre.c

Simple merge