PHPWord/samples
Ivan Lanin d3f62567e9 Merge remote-tracking branch 'remotes/upstream/develop' into develop
Conflicts:
	Classes/PHPWord/Section/Settings.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Writer/Word2007/Base.php
	README.md
2014-03-06 12:32:23 +07:00
..
old Fixed some merge issues 2013-12-16 06:40:30 -05:00
Sample_01_SimpleText.php Fixed some merge issues 2013-12-16 06:40:30 -05:00
Sample_02_TabStops.php Fixed some merge issues 2013-12-16 06:40:30 -05:00
Sample_03_Sections.php Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-03-06 12:32:23 +07:00
Sample_04_Textrun.php Ability to use images in a text run 2014-03-04 10:54:14 -07:00