Merge branch 'PHP-5.6' into PHP-7.0

Browse Source

Conflicts:
	ext/wddx/wddx.c

...

This commit is contained in:

Nikita Popov

2016-07-30 16:29:10 +02:00

parent 029f8e8777 99613431b4

commit dd7bea17bf

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