diff options
| author | Popa Adrian Marius <mapopa@reea.net> | 2014-04-28 12:13:11 +0300 |
|---|---|---|
| committer | Popa Adrian Marius <mapopa@reea.net> | 2014-04-28 12:13:11 +0300 |
| commit | bb422cb60e69794b3ea9d7d47fcc8a976a385608 (patch) | |
| tree | 6aaad65d2399d8a5515e24351478cb154992d3f3 /ext/json/json.c | |
| parent | d3dcd616231e6eda97a7b474bbd585a7f61f0b71 (diff) | |
| parent | dbcd6304bb2dc5bdab4d25c7fac8e578354ed2d9 (diff) | |
| download | php-git-bb422cb60e69794b3ea9d7d47fcc8a976a385608.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions