granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e7aebcc 677cd85)

author	Anatol Belski <ab@php.net>
	Wed, 11 Oct 2017 20:25:27 +0000 (22:25 +0200)
committer	Anatol Belski <ab@php.net>
	Wed, 11 Oct 2017 20:25:27 +0000 (22:25 +0200)
commit	81473829d4583f657ae07a6562e3d916fb6148bb
tree	3c41b1c03f00dc832a716bee9160a3f29da5b5bf	tree \| snapshot
parent	e7aebcc186aa3956c5c0e56f2f9141a73a635623	commit \| diff
parent	677cd85cb712d54d2c22a4d557efc30a6882fa60	commit \| diff

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
It looks like i should've taken joint response on ext/fileinfo long ago

ext/standard/credits_ext.h

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