troosan 1956908aa7 Merge remote-tracking branch ...

'geraldb-nicat/PHPWord/templateProcessingViaArray' into develop

Conflicts:
	docs/templates-processing.rst

2019-01-03 18:57:00 +01:00

..

PhpWord

Merge remote-tracking branch

2019-01-03 18:57:00 +01:00

bootstrap.php

update copyright to 2018

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