diff options
| author | Reeze Xia <reeze@php.net> | 2015-03-01 15:15:03 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-03-01 15:15:03 +0800 |
| commit | 7109a39ddb3b89e4111d379f6ce4004149fd0901 (patch) | |
| tree | 345a1125e506730791f39b32d1ecb086bafd967b | |
| parent | 54e2020ee3e6142a86db03f1a9d47bc763334dbb (diff) | |
| parent | 214350f4f44c006b1db2208e93bfaed6960b01b2 (diff) | |
| download | php-git-7109a39ddb3b89e4111d379f6ce4004149fd0901.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Bump header year
Update NEWS
Conflicts:
NEWS
| -rw-r--r-- | header | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2014 The PHP Group | + | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | |