]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03da5f8 995ac8a)
Merge branch 'PHP-7.2'
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 29 Nov 2017 16:06:47 +0000 (17:06 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 29 Nov 2017 16:06:47 +0000 (17:06 +0100)
* PHP-7.2:
  Define floorf if system doesn't have it (follow up for 22c48761)
  Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" This reverts commit a1845b7fdb5916b0951146ca18bb67ca83854733.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.