]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorFrank Denis <github@pureftpd.org>
Tue, 29 Aug 2017 17:25:58 +0000 (19:25 +0200)
committerFrank Denis <github@pureftpd.org>
Tue, 29 Aug 2017 17:25:58 +0000 (19:25 +0200)
* 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


Trivial merge