diff options
| author | Sara Golemon <sgolemon@fb.com> | 2014-10-02 18:55:29 -0700 |
|---|---|---|
| committer | Sara Golemon <sgolemon@fb.com> | 2014-10-02 18:55:29 -0700 |
| commit | f41a7b926ad6363354b5df913a2ac5bed808dc1d (patch) | |
| tree | ded946bc969ed6f18cd48c4549d2a63648e6112e /ext/pcre/php_pcre.c | |
| parent | 7a529790b2c1bf6f20affbe06914de32fcc94fb3 (diff) | |
| parent | 2cf94189a2ff97874469b7c0027713aaab7d74b1 (diff) | |
| download | php-git-f41a7b926ad6363354b5df913a2ac5bed808dc1d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add hash to EXTENSIONS file
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions