diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-06-13 08:08:21 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-06-13 08:08:21 +0200 |
| commit | b564aa95be5aefe062d2ddeb756da071f7984b40 (patch) | |
| tree | 708545627b44004005bf8646f9e9853f0d0740df /php.ini-development | |
| parent | 3bb1a4ffe387d0c3c18af364a8c568c71a7d7d8e (diff) | |
| parent | 9e4d7208258308a3b14075b683c5f604562baebe (diff) | |
| download | php-git-b564aa95be5aefe062d2ddeb756da071f7984b40.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix copy/paste error in test
Diffstat (limited to 'php.ini-development')
0 files changed, 0 insertions, 0 deletions