|
Merge branch 'develop' into StylesRebased
# Conflicts: # ClosedXML/Excel/Ranges/XLRanges.cs # ClosedXML/ClosedXML_Tests/Resource/Other/Charts/PreserveCharts/outputfile.xlsx |
|---|
| ClosedXML/Excel/AutoFilters/XLAutoFilter.cs |
|---|
| ClosedXML/Excel/CalcEngine/Functions/Tally.cs |
|---|
| ClosedXML/Excel/CalcEngine/Functions/XLMath.cs |
|---|
| ClosedXML/Excel/Cells/XLCell.cs |
|---|
| ClosedXML/Excel/ConditionalFormats/Save/XLCFCellIsConverter.cs |
|---|
| ClosedXML/Excel/DataValidation/IXLDataValidation.cs |
|---|
| ClosedXML/Excel/DataValidation/IXLDataValidations.cs |
|---|
| ClosedXML/Excel/DataValidation/XLDataValidation.cs |
|---|
| ClosedXML/Excel/DataValidation/XLDataValidations.cs |
|---|
| ClosedXML/Excel/Drawings/XLPicture.cs |
|---|
| ClosedXML/Excel/Ranges/XLRange.cs |
|---|
| ClosedXML/Excel/Ranges/XLRangeAddress.cs |
|---|
| ClosedXML/Excel/Rows/XLRow.cs |
|---|
| ClosedXML/Excel/Tables/IXLTableField.cs |
|---|
| ClosedXML/Excel/Tables/XLTable.cs |
|---|
| ClosedXML/Excel/Tables/XLTableField.cs |
|---|
| ClosedXML/Excel/XLWorkbook_Load.cs |
|---|
| ClosedXML/Excel/XLWorkbook_Save.cs |
|---|
| ClosedXML/Excel/XLWorksheet.cs |
|---|
| ClosedXML/XLHelper.cs |
|---|
| ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatTests.cs |
|---|
| ClosedXML_Tests/Excel/Saving/SavingTests.cs |
|---|
| ClosedXML_Tests/Excel/Styles/XLFillTests.cs |
|---|
| ClosedXML_Tests/Excel/Tables/TablesTests.cs |
|---|
| ClosedXML_Tests/Resource/Other/Charts/PreserveCharts/inputfile.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/Charts/PreserveCharts/outputfile.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/Drawings/NoDrawings/outputfile.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/StyleReferenceFiles/ConditionalFormattingOrder/ConditionalFormattingOrder.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/StyleReferenceFiles/ConditionalFormattingOrder/inputfile.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/StyleReferenceFiles/TransparentBackgroundFill/TransparentBackgroundFill.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/Other/StyleReferenceFiles/TransparentBackgroundFill/inputfile.xlsx 0 → 100644 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/StyleReferenceFiles/ConditionalFormattingOrder/ConditionalFormattingOrder.xlsx 100644 → 0 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/StyleReferenceFiles/ConditionalFormattingOrder/inputfile.xlsx 100644 → 0 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/StyleReferenceFiles/TransparentBackgroundFill/TransparentBackgroundFill.xlsx 100644 → 0 |
|---|
|
Not supported
|
| ClosedXML_Tests/Resource/StyleReferenceFiles/TransparentBackgroundFill/inputfile.xlsx 100644 → 0 |
|---|
|
Not supported
|
| ClosedXML_Tests/TestHelper.cs |
|---|