php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2da66d361483f7511e861d0dc950bb048551df2
archived-php-src/ext/json/json_encoder.c
T
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

15 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink