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

1  2 
ext/pcre/php_pcre.c

Simple merge