]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c73a2f7 ec82c6b)
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Tue, 28 Jun 2016 03:11:39 +0000 (11:11 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 28 Jun 2016 03:11:39 +0000 (11:11 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Fix the fix for #72403 on nl2br
  Update NEWS
  Update NEWS
  Fix #70628: Clearing bindings on an SQLite3 statement doesn't work
  5.5.38 now


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.