MarkBaker fb2edfdacf Merge branch 'develop' of https://github.com/PHPOffice/PhpSpreadsheet into develop ... # Conflicts: # src/Autoloader.php		2016-08-31 21:58:08 +01:00
..
PhpSpreadsheet	Merge branch 'develop' of https://github.com/PHPOffice/PhpSpreadsheet into develop	2016-08-31 21:58:08 +01:00
Autoloader.php	As iconv is now enabled by default in PHP, make it a requirement, and modify strig functions to use it where appropriate	2016-08-31 21:52:42 +01:00
Bootstrap.php	Introduce vendor prefix `PhpOffice` to namespace	2016-09-01 02:20:47 +09:00