diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:31:18 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:47:28 +0100 |
| commit | 88d1a2c5aab441fd322683f8d21667932aeec636 (patch) | |
| tree | fe7725d6ae59aa0eb60154f240a923d57f5be61f /ext/json/php_json_parser.h | |
| parent | a8931df672bb173ef81c10e4fc2a5de23789c935 (diff) | |
| parent | 2ba3b275948050ce600c5234b66e840b640ca5a5 (diff) | |
| download | php-git-88d1a2c5aab441fd322683f8d21667932aeec636.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Fix #73530: Unsetting result set may reset other result set"
# Conflicts:
# ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions