MarkBaker 850594c4d2 Merge branch 'develop' into feature/gh-7 ... # Conflicts: # tests/PhpSpreadsheet/Shared/DateTest.php # tests/rawTestData/Shared/DateTimeExcelToPHP1900.data # tests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data # tests/rawTestData/Shared/DateTimeExcelToPHP1904.data # unitTests/rawTestData/Shared/DateTimeExcelToPHP1900.data # unitTests/rawTestData/Shared/DateTimeExcelToPHP1904.data # unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1900.data # unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1904.data		2016-08-14 02:07:10 +01:00
..
rawTestData/Shared	Merge branch 'develop' into feature/gh-7	2016-08-14 02:07:10 +01:00
dateTest.log	Merge branch 'develop' into feature/gh-7	2016-08-14 02:07:10 +01:00