diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-08-04 06:37:15 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-08-04 06:37:15 +0200 |
commit | 0f57a7f259f0e3ce58f6418fa6a1ccbc7c5bf0bc (patch) | |
tree | 34b7f9584457d3ca554ee7249a7c4d9bedea2524 /.gitignore | |
parent | 2ea7222440c92561e9774bb5d32ff1135935ef93 (diff) | |
parent | 9286681bac2c7dcd99e7de62eb8b963c0736e31d (diff) | |
download | php-git-0f57a7f259f0e3ce58f6418fa6a1ccbc7c5bf0bc.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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 16769d34a9..691968ac6a 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ sapi/fpm/www.conf sapi/phpdbg/phpdbg_parser.c sapi/phpdbg/phpdbg_parser.h sapi/phpdbg/phpdbg +sapi/phpdbg/phpdbg.1 sapi/phpdbg/build sapi/phpdbg/*.output scripts/php-config |