diff options
| author | Matteo Beccati <mbeccati@php.net> | 2016-08-04 09:37:40 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2016-08-04 09:37:40 +0200 |
| commit | 70698d15662e17d5832d0316b358195c486226a5 (patch) | |
| tree | 8e9f4d60b860a2abfd0c2abb927126329c2d72ce /ext/mbstring/php_mbregex.c | |
| parent | 0781f512c38024c9f69720a72de11857cd546456 (diff) | |
| parent | 4003595d6000477e86db9c868375acb577f47131 (diff) | |
| download | php-git-70698d15662e17d5832d0316b358195c486226a5.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Clean up FR #72633
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Conflicts:
ext/oci8/package.xml
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions