diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-03-31 09:28:22 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-03-31 09:28:22 +0300 |
| commit | 5417f22e99beefbe012a0aef5693a05be7d3674d (patch) | |
| tree | 76f4515331ff0efd7d422dd670e56b86709190e4 /Zend/zend_inheritance.c | |
| parent | d7835ee22417c45aed39cc325a8e929774faa19c (diff) | |
| parent | 0c1c7c7ecb476f13ff1a9bdff895810a0c562195 (diff) | |
| download | php-git-5417f22e99beefbe012a0aef5693a05be7d3674d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
Align NEWS entries with 5.6.7
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions