Commit Graph

6 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
Gabriel Bull 6f2297ea9a Added PSR-4 Autoloader 2014-03-02 13:44:00 -05:00
Gabriel Bull d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Progi1984 79a87a1f8d ADDED : Basic unit tests 2014-02-24 19:38:44 +01:00
Progi1984 4ffa261a6c Merge branch 'master' of https://github.com/PHPOffice/PHPWord 2014-02-24 19:38:09 +01:00
Progi1984 075ca157d7 ADDED : Basic unit tests 2014-02-24 19:17:06 +01:00