diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-17 09:21:39 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-17 09:21:39 -0700 |
| commit | a4b44774665303927cea5d06afc52faafda18d05 (patch) | |
| tree | 825586b5a3195a273bc9e20c7658f32a8ed8e8e8 /ext/zip/php_zip.c | |
| parent | 4628c9b3752fd001d0d25e53fd77d322ae8d5152 (diff) | |
| parent | d89d46d9409309592b1896493d85ff35974321f3 (diff) | |
| download | php-git-a4b44774665303927cea5d06afc52faafda18d05.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
Added support for TLSv1.1 and TLSv1.2
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions