diff options
| author | Julien Pauli <jpauli@php.net> | 2014-11-28 13:31:53 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-11-28 13:31:53 +0100 |
| commit | 96f2265d583310bcd9782d97460ba73cd64367f6 (patch) | |
| tree | 74f368547a0a9d432e22595fe4a5873a879f2305 /sapi/cli/php_http_parser.c | |
| parent | 5f65c77e98fe2b49ad8b8fcd842ad6b20c999ea4 (diff) | |
| parent | a76f8e297d60201631021cc20526968fd0de4ef0 (diff) | |
| download | php-git-96f2265d583310bcd9782d97460ba73cd64367f6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'sapi/cli/php_http_parser.c')
0 files changed, 0 insertions, 0 deletions