diff options
| author | Julien Pauli <jpauli@php.net> | 2016-09-19 16:08:37 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-09-19 16:11:17 +0200 |
| commit | c4f3ea10e49a2a44e767ce38c57329934a6bbaba (patch) | |
| tree | 168fe7732a5b216389c16e5c9e1e0e6587c1eb47 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 01759c43463c30b57c15e32c5f4b454fba81f039 (diff) | |
| parent | 1ed4b13fb62eafc53fca06c1929613c334b51edb (diff) | |
| download | php-git-c4f3ea10e49a2a44e767ce38c57329934a6bbaba.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions