]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d25049c a9e8239)
Merge branch 'PHP-7.1' into PHP-7.2
authorSara Golemon <pollita@php.net>
Wed, 19 Jul 2017 18:01:18 +0000 (14:01 -0400)
committerSara Golemon <pollita@php.net>
Wed, 19 Jul 2017 18:01:18 +0000 (14:01 -0400)
commitbb02f99e7186a31aeb328eae4a9eeba1431a3e8f
tree79b75396a3c19ddae08f016f92aaf0a83e13ab92tree | snapshot
parentd25049cc1b74ae445d6521997a421a7462f1ad5bcommit | diff
parenta9e8239f4521a353765880fb3b1e719cc9d3fc99commit | diff
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
main/streams/userspace.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.