diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 11:47:38 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 11:47:38 +0800 |
| commit | 2d21404e25174e5f804c897a8e9f289d8e7631b3 (patch) | |
| tree | 5a9be52a61c65250f19803272b824dea1a66ab17 /ext/standard/php_crypt_r.c | |
| parent | 2b2c6821cdfa9c0d7e6977e4db7a4a0504720613 (diff) | |
| parent | bb5535bd38549b0b1b3bc228ad77bd5d1dfaada4 (diff) | |
| download | php-git-2d21404e25174e5f804c897a8e9f289d8e7631b3.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
Missed NEWS
Conflicts:
ext/fileinfo/libmagic.patch
Diffstat (limited to 'ext/standard/php_crypt_r.c')
0 files changed, 0 insertions, 0 deletions