granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2b36f3d c9fd093)

author	Sara Golemon <pollita@php.net>
	Wed, 19 Jul 2017 18:01:00 +0000 (14:01 -0400)
committer	Sara Golemon <pollita@php.net>
	Wed, 19 Jul 2017 18:01:00 +0000 (14:01 -0400)
commit	a9e8239f4521a353765880fb3b1e719cc9d3fc99
tree	a35d3c6006feed772e875ee8ff12d63b15b46f3f	tree \| snapshot
parent	2b36f3d71f2737209b636a888eb1f299561a1e16	commit \| diff
parent	c9fd093127e1386a4cd768749d42fe148a87e9e2	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Do not allow using traits/interfaces/abstract classes as stream wrappers

main/streams/userspace.c

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