troosan b2c627d57c Merge branch 'parsing_heading2' develop ...

Conflicts:
	src/PhpWord/Reader/Word2007/Styles.php
	tests/PhpWord/Reader/Word2007/StyleTest.php

2018-12-28 22:33:48 +01:00

..

Word2007

Merge branch 'parsing_heading2' develop

2018-12-28 22:33:48 +01:00

HTMLTest.php

update copyright to 2018

2018-03-08 23:52:25 +01:00

MsDocTest.php

update copyright to 2018

2018-03-08 23:52:25 +01:00

ODTextTest.php

update copyright to 2018

2018-03-08 23:52:25 +01:00

RTFTest.php

update copyright to 2018

2018-03-08 23:52:25 +01:00

Word2007Test.php

merge/add test/cleanup

2018-03-25 22:46:50 +02:00