Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101 Commits 6 Branches 21 Tags
Commit Graph

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
075ca157d7 ADDED : Basic unit tests 2014-02-24 19:17:06 +01:00