troosan 8f512bf618 Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord ... into develop Conflicts: src/PhpWord/Shared/Html.php		2017-12-05 17:33:51 +01:00
..
PhpWord	Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord	2017-12-05 17:33:51 +01:00
bootstrap.php	Enable php-cs-fixer in build & fix resulting warnings (#1099)	2017-11-04 22:44:12 +01:00