Commit Graph

5 Commits

Author SHA1 Message Date
Ivan Lanin 35d06cc2ce Change PHPWord license to LGPL 3 as per #211 2014-05-04 17:55:54 +07:00
Roman Syroeshko db1d89ab23 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	src/PhpWord/Element/Section.php
	src/PhpWord/Endnotes.php
	src/PhpWord/Footnotes.php
	src/PhpWord/Media.php
	src/PhpWord/PhpWord.php
	src/PhpWord/Reader/Word2007.php
	src/PhpWord/Writer/AbstractWriter.php
	src/PhpWord/Writer/ODText/Content.php
	src/PhpWord/Writer/Word2007.php
	src/PhpWord/Writer/Word2007/Notes.php
2014-04-16 17:39:26 +04:00
Roman Syroeshko 2c1c1ea60f [IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-16 17:22:30 +04:00
Ivan Lanin ae652a6379 Update upcoming version number to 0.10.0 as per #178 2014-04-11 19:04:53 +07:00
Ivan Lanin f837381238 Ability to add Endnotes 2014-04-10 01:36:41 +07:00