RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-22 05:16:06 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Classes/PHPExcel/Calculation/Functions.php
#	Classes/PHPExcel/Worksheet.php
#	Classes/PHPExcel/Worksheet/CellIterator.php
This commit is contained in:
MarkBaker 2018-11-23 00:07:24 +01:00
commit 1441011fb7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Classes/PHPExcel/Calculation/Functions.php
View File

@ -518,15 +518,14 @@ class PHPExcel_Calculation_Functions
}
/**
* VERSION
*
* @return string Version information
*/
public static function VERSION()
{
return 'PHPExcel ##VERSION##, ##DATE##';
}
/**
* VERSION
*
* @return string Version information
*/
public static function VERSION() {
return 'PHPExcel 1.8.2, 2018-11-22';
} // function VERSION()
/**

2
Classes/PHPExcel/Worksheet/CellIterator.php
View File

@ -70,7 +70,7 @@ abstract class PHPExcel_Worksheet_CellIterator
* Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
*
* @throws PHPExcel_Exception
*/
*/
abstract protected function adjustForExistingOnlyRange();
/**