diff options
| author | Remi Collet <remi@php.net> | 2014-03-12 15:36:08 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-12 15:36:08 +0100 |
| commit | 5bd13c523125a552f712f87a0ae55bb236c8fb54 (patch) | |
| tree | 4c578cc550ce6d4bf850a98b6aec54e079750cb7 /ext/mysql/php_mysql.c | |
| parent | 5e93a213f66c06650c5a8bbfd05f00265c2a5d79 (diff) | |
| parent | f2d5b2b6c657db29af3bc92d93645ff66574b56f (diff) | |
| download | php-git-5bd13c523125a552f712f87a0ae55bb236c8fb54.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #66893i imagescale ignore method argument
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions