Merge remote-tracking branch 'upstream/develop' into load-pivot-tables
# Conflicts:
#	ClosedXML_Tests/ClosedXML_Tests.csproj
#	ClosedXML_Tests/Excel/Loading/LoadingTests.cs
commit 924a6b7797902fa1a935420f0a9d08b3e9590b7d
2 parents b470f9e + eaa17df
@Francois Botha Francois Botha authored on 5 Jan 2017
Showing 11 changed files
View
ClosedXML/Excel/Tables/XLTable.cs
View
ClosedXML/Excel/XLWorkbook_Load.cs
View
ClosedXML/Excel/XLWorkbook_Save.NestedTypes.cs
View
ClosedXML/Excel/XLWorkbook_Save.cs
View
ClosedXML/Excel/XLWorksheet.cs
View
ClosedXML_Examples/PivotTables/PivotTables.cs
View
ClosedXML_Tests/ClosedXML_Tests.csproj
View
ClosedXML_Tests/Excel/Loading/LoadingTests.cs
View
ClosedXML_Tests/Resource/Examples/PageSetup/TwoPages.xlsx
Not supported
View
ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
Not supported
View
ClosedXML_Tests/Resource/Misc/FileWithMismatchSheetIdAndRelId.xlsx 0 → 100644
Not supported