diff options
author | Frank Denis <github@pureftpd.org> | 2017-08-29 19:25:58 +0200 |
---|---|---|
committer | Frank Denis <github@pureftpd.org> | 2017-08-29 19:25:58 +0200 |
commit | 72680717288f198b5046194a76ecf72a08f13888 (patch) | |
tree | 334249afb30ed9c7f3e07bc0f3a9143a28a1db73 /Zend | |
parent | fac553e6a6f415fe31dcea4d0ad70d24926539f9 (diff) | |
parent | 04c87ea815e20dbfabfa5e33e6f2de11664f1cfc (diff) | |
download | php-git-72680717288f198b5046194a76ecf72a08f13888.tar.gz |
Merge branch 'PHP-7.2'
* PHP-7.2:
ext/sodium: the second parameter of sodium_hex2bin() is optional
ext/sodium: AI_StringRef_And_String -> AI_StringRefAndString for consistency
ext/sodium: sort functions list
Diffstat (limited to 'Zend')
0 files changed, 0 insertions, 0 deletions