diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:47:16 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2016-01-01 19:48:25 +0200 |
| commit | ed35de784f4ea53927e906ba4af335778de4d16a (patch) | |
| tree | 3b95626566e3447a23890e63e8450c1611f26eba /ext/mysqli/mysqli_prop.c | |
| parent | 87958927b0cef17ba06a8739c7febca8e920c6de (diff) | |
| parent | 49493a2dcfb2cd1758b69b13d9006ead3be0e066 (diff) | |
| download | php-git-ed35de784f4ea53927e906ba4af335778de4d16a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 11f136e603..e679dcc48e 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | |