]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Tue, 20 Feb 2018 07:00:08 +0000 (08:00 +0100)
committerAnatol Belski <ab@php.net>
Tue, 20 Feb 2018 07:00:08 +0000 (08:00 +0100)
* PHP-7.1:
  dos2unix


Trivial merge