diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-11 13:26:30 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-11 13:26:30 +0200 |
commit | cd16b64f0100cbeae4458e98b59b2c6c23c14982 (patch) | |
tree | 659a063939721943f9d02afe37a0fb1863f67764 /.gitignore | |
parent | 95e4e6a3ce35757c1d681fad3f1926d204dc746e (diff) | |
parent | dc09f309335cf8df7d39adc03580ac8d4f0c78f5 (diff) | |
download | php-git-cd16b64f0100cbeae4458e98b59b2c6c23c14982.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a00615f966..c427f0da64 100644 --- a/.gitignore +++ b/.gitignore @@ -148,6 +148,7 @@ tests/*/*/*.sh */tests/*/*/*.sh */*/tests/*.diff */*/tests/*.out +*/*/tests/*.out.png */*/tests/*.php */*/tests/*.exp */*/tests/*.log |