diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
| commit | 12b15e5ca4ae7ebf6e50551a4c666ece97068074 (patch) | |
| tree | af4eaae6897444c3d8a987d59b695984a26d25d7 /ext/json/php_json.h | |
| parent | 545c296ef4b5ffdb1cf59583c55129f08d75601b (diff) | |
| parent | 6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff) | |
| download | php-git-12b15e5ca4ae7ebf6e50551a4c666ece97068074.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 08a4a7ff94..05dcc43e06 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ |