diff options
author | Anatol Belski <ab@php.net> | 2017-10-11 22:25:27 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-10-11 22:25:27 +0200 |
commit | 81473829d4583f657ae07a6562e3d916fb6148bb (patch) | |
tree | 3c41b1c03f00dc832a716bee9160a3f29da5b5bf /ext/standard | |
parent | e7aebcc186aa3956c5c0e56f2f9141a73a635623 (diff) | |
parent | 677cd85cb712d54d2c22a4d557efc30a6882fa60 (diff) | |
download | php-git-81473829d4583f657ae07a6562e3d916fb6148bb.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
It looks like i should've taken joint response on ext/fileinfo long ago
Diffstat (limited to 'ext/standard')
-rw-r--r-- | ext/standard/credits_ext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h index 94a3d6fe7e..cf42624977 100644 --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@ -22,7 +22,7 @@ CREDIT_LINE("DBA", "Sascha Schumann, Marcus Boerger"); CREDIT_LINE("DOM", "Christian Stocker, Rob Richards, Marcus Boerger"); CREDIT_LINE("enchant", "Pierre-Alain Joye, Ilia Alshanetsky"); CREDIT_LINE("EXIF", "Rasmus Lerdorf, Marcus Boerger"); -CREDIT_LINE("fileinfo", "Ilia Alshanetsky, Pierre Alain Joye, Scott MacVicar, Derick Rethans"); +CREDIT_LINE("fileinfo", "Ilia Alshanetsky, Pierre Alain Joye, Scott MacVicar, Derick Rethans, Anatol Belski"); CREDIT_LINE("Firebird driver for PDO", "Ard Biesheuvel"); CREDIT_LINE("FTP", "Stefan Esser, Andrew Skalski"); CREDIT_LINE("GD imaging", "Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger"); |