diff options
author | Sara Golemon <pollita@php.net> | 2013-12-04 07:50:45 -0800 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2013-12-04 07:50:45 -0800 |
commit | f0248bdce598a382899056d348d204c9d61746df (patch) | |
tree | 399aaa7619bf8c82d68b8c20998887b01bfcc31f /sapi/phpdbg/phpdbg_help.c | |
parent | 97909ef4efb6756730b814c9966579ea6ec9e3ba (diff) | |
parent | 32a4cc8353ff94d107611f00e7376e8e1baae926 (diff) | |
download | php-git-f0248bdce598a382899056d348d204c9d61746df.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Use 'user@example.com' rather than 'user@company.com' in tests
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions