]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59a7944 e97b10f)
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:45:59 +0000 (13:45 +0200)
committerAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:45:59 +0000 (13:45 +0200)
* PHP-7.2:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283


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