Merge branch 'PHP-5.6' into PHP-7.0

Browse Source

* PHP-5.6:
  Better fix for #71952

Conflicts:
	ext/gd/gd.c

...

This commit is contained in:

Stanislav Malyshev

2016-04-19 23:45:21 -07:00

parent 086729bb6c c02301b666

commit 7d93363bd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available