]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Thu, 21 Dec 2017 14:42:16 +0000 (15:42 +0100)
committerAnatol Belski <ab@php.net>
Thu, 21 Dec 2017 14:42:16 +0000 (15:42 +0100)
commitaa978538ca1c3ac812c8eb5d8fd1744cde86d00e
treea58e422367f7ca473f471d423a990a9792b03416
parent3c57027556993e893b3cbef46c3b700905589f52
parente313daa598bd6493c6117bbe8162a6795183b722
Merge branch 'PHP-7.2'

* PHP-7.2:
  fileinfo: fix misleading indentation in libmagic