php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
110,727 Commits 549 Branches 1,484 Tags
5f4e034e570176cf63aaa29d2d476ddff2d0580b
Commit Graph

2 Commits

Author SHA1 Message Date
Julien Pauli 7c7dc62c11 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json_encoder.c
 2016-09-19 16:42:53 +02:00
Jakub Zelenka 27acbcf4df Add test for fixed bug #68992 2016-08-29 14:49:40 +01:00