granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f63a0fe 23e97b0)

author	Anatol Belski <ab@php.net>
	Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)
committer	Anatol Belski <ab@php.net>
	Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)
commit	677cd85cb712d54d2c22a4d557efc30a6882fa60
tree	8aae36a9ef3ea2c95ec441667f12ae293d07697a	tree \| snapshot
parent	f63a0fef6b0cc9f8e4688372b1e783f3f02d8523	commit \| diff
parent	23e97b022226a2b790f9b1b1f5a96959501be647	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
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.