mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts: configure.in main/php_version.h
This commit is contained in:
commit
581e890483
Conflicts: configure.in main/php_version.h