]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:33:53 +0000 (12:33 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:33:53 +0000 (12:33 -0700)
* PHP-7.0:
  Fix the fix for #72403 on nl2br
  5.5.38 now


Trivial merge