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

..

Collection

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

ComplexType

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Element

add getter/setter on paragraph for child spacing rule

2017-11-22 00:14:31 +01:00

Escaper

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Exception

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Metadata

add getter/setter on paragraph for child spacing rule

2017-11-22 00:14:31 +01:00

Reader

Merge pull request #578 from ComputerTinker/develop

2017-11-08 00:31:45 +01:00

resources

Refactor: Create writers' Part folders and remove all static parts

2014-04-30 13:49:48 +07:00

Shared

Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord

2017-12-05 17:33:51 +01:00

SimpleType

add getter/setter on paragraph for child spacing rule

2017-11-22 00:14:31 +01:00

Style

fix wrong variable

2017-11-22 08:41:42 +01:00

Writer

add getter/setter on paragraph for child spacing rule

2017-11-22 00:14:31 +01:00

IOFactory.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Media.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

PhpWord.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Settings.php

CS fixer warning

2017-11-22 09:02:16 +01:00

Style.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

Template.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00

TemplateProcessor.php

Enable php-cs-fixer in build & fix resulting warnings (#1099)

2017-11-04 22:44:12 +01:00