diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-08-04 06:35:40 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-08-04 06:35:40 +0200 |
commit | 9286681bac2c7dcd99e7de62eb8b963c0736e31d (patch) | |
tree | df7848543f5d697ed869f42d80ceb20b5b12a056 /.gitignore | |
parent | 0872e80dd8e3544d3e90c16f63bc513de86405cb (diff) | |
parent | 91996e7ee504311ff4eca9dbd5840114f75acbad (diff) | |
download | php-git-9286681bac2c7dcd99e7de62eb8b963c0736e31d.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug 76595: Update phpdbg man page
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f3f79b2ea1..2e45e0a44f 100644 --- a/.gitignore +++ b/.gitignore @@ -191,6 +191,7 @@ sapi/fpm/fpm/php-cgi sapi/phpdbg/phpdbg_parser.c sapi/phpdbg/phpdbg_parser.h sapi/phpdbg/phpdbg +sapi/phpdbg/phpdbg.1 scripts/php-config scripts/phpize scripts/man1/*.1 |