diff options
author | Christoph M. Becker <cmb@php.net> | 2015-08-11 01:23:18 +0200 |
---|---|---|
committer | Christoph M. Becker <cmb@php.net> | 2015-08-11 01:23:18 +0200 |
commit | 913fc54e0ffa8089fec6b6c194a763a5b5fc6a45 (patch) | |
tree | 6cf836ee05fc87c9e9921fea93e1c0cca221985f /ext/mcrypt/php_mcrypt.h | |
parent | 8394713e5d591c87cdc355fffa8803b495697fd4 (diff) | |
parent | 8bac087a79863870a3dfe78c8b3468edf63b063c (diff) | |
download | php-git-913fc54e0ffa8089fec6b6c194a763a5b5fc6a45.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Add CVE IDs asigned to #69085 (PHP 5.6.7)
Align NEWS with 5.6.12
Add entries for phar bug fixes in 5.6.11 (also have CVE assigned)
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions