diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-06-21 17:26:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-06-21 17:26:27 +0800 |
| commit | 939e1095f260a502584289e5bd6ed8c2d2cf90ce (patch) | |
| tree | 3fc83ea23b02bf8cf35f17569bb03f6ffea76bd0 /sapi/phpdbg/phpdbg_utils.c | |
| parent | 011be49dda5c36d6a04af83165c872196342ebaa (diff) | |
| parent | 6531719da575e8ceb14fa8e9fefcac2ab365dd00 (diff) | |
| download | php-git-939e1095f260a502584289e5bd6ed8c2d2cf90ce.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions