]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 13:50:48 +0000 (15:50 +0200)
committerFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 13:50:48 +0000 (15:50 +0200)
* PHP-7.2:
  sodium ext: skip scrypt if it is not available
  sodium ext: fix tests/pwhash_argon2i description
  sodium ext: check hash length for scrypt


Trivial merge