mirror of
https://github.com/php/php-src.git
synced 2025-08-18 15:08:55 +02:00
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts: # ext/gd/tests/gd_info_variation1.phpt
This commit is contained in:
commit
138fea83fe
1 changed files with 1 additions and 1 deletions
|
@ -27,7 +27,7 @@ array(%d) {
|
|||
["GD Version"]=>
|
||||
string(%d) %s
|
||||
["FreeType Support"]=>
|
||||
bool(%s)
|
||||
bool(%a
|
||||
["GIF Read Support"]=>
|
||||
bool(%s)
|
||||
["GIF Create Support"]=>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue