]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorFrank Denis <github@pureftpd.org>
Sat, 24 Nov 2018 16:56:33 +0000 (17:56 +0100)
committerFrank Denis <github@pureftpd.org>
Sat, 24 Nov 2018 16:56:33 +0000 (17:56 +0100)
* PHP-7.2:
  ext/sodium: remove redundant code
  ext/sodium: Correct base64 decoding with unpadded variants

1  2 
ext/sodium/libsodium.c

Simple merge