diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-26 15:13:40 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-26 15:13:40 +0100 |
| commit | 2f5ba1ef69af44bc827c5806ce9198b753d76aba (patch) | |
| tree | 95a16c094f872db5362af61e16c572ca310bdd6b | |
| parent | 2b3483249cff7c428babea17de9179a1f1abfc63 (diff) | |
| parent | d18089d62181b000d67b66e928cc796d8dd277e7 (diff) | |
| download | php-git-2f5ba1ef69af44bc827c5806ce9198b753d76aba.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add news entry
add news entry
add clear_env option to FPM config
add clear_env option to FPM config
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
0 files changed, 0 insertions, 0 deletions