archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into jsond

Browse source 
Conflicts:
	ext/json/JSON_parser.c
	ext/json/json.c
This commit is contained in:
Jakub Zelenka 2015-01-25 18:43:15 +00:00
commit 3159d518d0
1126 changed files with 189354 additions and 186679 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/json/php_json.h
View file

@ -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 |