Gabriel Bull 12a79779bf Merge branch 'refs/heads/master' into develop ...

Conflicts:
	changelog.txt

2014-03-16 17:01:05 -04:00

..

_files

Additional template test

2014-03-16 08:42:02 +07:00

_inc

Added test case for image type detection

2014-03-16 16:57:17 -04:00

PHPWord

Merge branch 'refs/heads/master' into develop

2014-03-16 17:01:05 -04:00

bootstrap.php

Unit test for Reader and additional methods for DocumentProperties, adapted from PHPExcel

2014-03-12 00:12:55 +07:00

PHPWordTest.php

Bugfix on PHPWordTest

2014-03-16 00:25:49 +07:00