]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:39:01 +0000 (00:39 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:39:01 +0000 (00:39 -0700)
* PHP-7.0:
  Implement #47456: Missing PCRE option 'J'

1  2 
ext/pcre/php_pcre.c

Simple merge