php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff4e330eae7aa2550c483d480cb98054e251da55
archived-php-src/ext/json/json_encoder.c
T
Julien Pauli c4f3ea10e4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json.c
2016-09-19 16:11:17 +02:00

14 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink