diff options
| author | Sara Golemon <pollita@php.net> | 2017-07-19 14:01:18 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-07-19 14:01:18 -0400 |
| commit | bb02f99e7186a31aeb328eae4a9eeba1431a3e8f (patch) | |
| tree | 79b75396a3c19ddae08f016f92aaf0a83e13ab92 /ext/mbstring/php_unicode.c | |
| parent | d25049cc1b74ae445d6521997a421a7462f1ad5b (diff) | |
| parent | a9e8239f4521a353765880fb3b1e719cc9d3fc99 (diff) | |
| download | php-git-bb02f99e7186a31aeb328eae4a9eeba1431a3e8f.tar.gz | |
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
Diffstat (limited to 'ext/mbstring/php_unicode.c')
0 files changed, 0 insertions, 0 deletions