Merge branch 'master' into develop

Browse Source

Conflicts:
	CHANGELOG.md
	VERSION
	samples/Sample_12_HeaderFooter.php
	tests/PhpWord/Tests/Element/PreserveTextTest.php

...

This commit is contained in:

Roman Syroeshko 2015-11-14 22:18:57 +04:00

parent e771b473a6 38cb04d322

commit c75bbf16a7

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

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

Diff Content Not Available