diff options
| author | Christopher Jones <sixd@php.net> | 2014-08-07 09:29:47 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-08-07 09:29:47 -0700 |
| commit | 45caa88c29421d7e16cf23b118ebeacbbe326f60 (patch) | |
| tree | f06a11a4fd4d5119ac7b14d1da10e824c7119c65 /ext/mysql/php_mysql.c | |
| parent | 98e67add15a6b889efe152c23ed15a61f022a63a (diff) | |
| parent | 1d16d8f6ff6658aef254f107fed34f4de1f5f48a (diff) | |
| download | php-git-45caa88c29421d7e16cf23b118ebeacbbe326f60.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Small tidy ups and raise visibility of GitHub PR process
Conflicts:
README.SUBMITTING_PATCH
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions