diff options
| author | Anatol Belski <ab@php.net> | 2016-06-21 09:53:04 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-21 09:53:04 +0200 |
| commit | 6d7500c14cf92948e177521134cf6c04701d4551 (patch) | |
| tree | de0b19a5df99c3960c1c1cbd594bc425168ffaee | |
| parent | fd93c8601dd3443614a32ce5dba0a275813954b1 (diff) | |
| parent | 0c7250f260303061425d0d8a348d1a80fa0cc12e (diff) | |
| download | php-git-6d7500c14cf92948e177521134cf6c04701d4551.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
remove the huge test file, generate it on the fly instead
0 files changed, 0 insertions, 0 deletions