summaryrefslogtreecommitdiff
path: root/ext/dom/php_dom.c
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2015-02-11 22:30:48 +0200
committerLior Kaplan <kaplanlior@gmail.com>2015-02-11 22:30:48 +0200
commitc741faf4bb57cff872c412cbf1183cd33f13fbed (patch)
tree5b112278749eb3dc27a8d239c63fcae094a025fc /ext/dom/php_dom.c
parent701a5f9de9708467501deedaf0f712f535f53aa0 (diff)
parente6d8bad618b17b67ae4faff5c87721c2d755c71d (diff)
downloadphp-git-c741faf4bb57cff872c412cbf1183cd33f13fbed.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18 Add missing NEWS entry for revert of bug #41631 Add missing NEWS entry for bug #68027 Align format for bug #68799 Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19 Bug #55618 was fixed in 5.5.21 using eaf107c0 Add security bugs fixed in 5.5.18 Add CVE ID to bug #68676 Align email format for recent NEWS entries
Diffstat (limited to 'ext/dom/php_dom.c')
0 files changed, 0 insertions, 0 deletions