Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
PHPWord/Classes
History
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
..
PHPWord Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-03-06 12:32:23 +07:00
PHPWord.php Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-03-06 12:32:23 +07:00