]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 320e891 dc1a8dd)
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Fri, 4 Sep 2015 23:32:08 +0000 (01:32 +0200)
committerChristoph M. Becker <cmb@php.net>
Fri, 4 Sep 2015 23:32:08 +0000 (01:32 +0200)
commitc9a8733ce2a953e46c07c380b15617d62f51dabd
tree3878419198e7f05c9e2ac1c486c92fff20a7a25ctree | snapshot
parent320e891f5b39d26b422185803c809c995b43b7b2commit | diff
parentdc1a8dd7f09af5807aadf3ed5ffc9c443cd9e74ccommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70001: Assigning to DOMNode::textContent does additional entity encoding

Resolved conflicts:
ext/dom/node.c
ext/dom/node.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.