2 Commits

Author	SHA1	Message	Date
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
Progi1984	d1e16a66d6	GH-5 : Word2007 : Added support for page header & page footer height	2014-03-03 20:15:29 +01:00