diff options
| author | Brad Broerman <bbroerman@bbroerman.net> | 2014-12-30 19:44:45 -0500 |
|---|---|---|
| committer | Brad Broerman <bbroerman@bbroerman.net> | 2014-12-30 19:44:45 -0500 |
| commit | 49571cfad767019533ef184cf98302b2e6b8794d (patch) | |
| tree | 8dfe1aac4eaf7712f78d69a358075ed406b7dc7b /ext/mysql/mysql_mysqlnd.h | |
| parent | e4c967a02887f474beb67fc1c6cd46fa46d6316a (diff) | |
| parent | 365f428d463502fd8a2c63640b280753df4bf71f (diff) | |
| download | php-git-49571cfad767019533ef184cf98302b2e6b8794d.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/mysql/mysql_mysqlnd.h')
| -rw-r--r-- | ext/mysql/mysql_mysqlnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/mysql_mysqlnd.h b/ext/mysql/mysql_mysqlnd.h index 0c4c221b15..29ac9838f2 100644 --- a/ext/mysql/mysql_mysqlnd.h +++ b/ext/mysql/mysql_mysqlnd.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 2006-2009 The PHP Group | +----------------------------------------------------------------------+ |