troosan a6c6f9faa1 Merge branch 'development' into develop ...

Conflicts:
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php

2017-07-04 15:38:01 +02:00

..

PhpWord

Merge branch 'development' into develop

2017-07-04 15:38:01 +02:00

bootstrap.php

Updated copyright.

2016-07-31 12:35:08 +04:00