Skip to content
Blame Permalink
  • daniel.rentz's avatar
    11a67c33
    Merge remote-tracking branch 'origin/develop' into noce · 11a67c33
    daniel.rentz authored 
    # Conflicts:
#	com.openexchange.office.ooxml.xlsx/src/com/openexchange/office/ooxml/xlsx/operations/XlsxCreateOperationHelper.java
#	com.openexchange.office.ooxml.xlsx/src/com/openexchange/office/ooxml/xlsx/tools/RowUtils.java
#	com.openexchange.office.realtime/src/com/openexchange/office/realtime/impl/calc/CalcConnection.java
    11a67c33
    Merge remote-tracking branch 'origin/develop' into noce
    daniel.rentz authored 
    # Conflicts:
#	com.openexchange.office.ooxml.xlsx/src/com/openexchange/office/ooxml/xlsx/operations/XlsxCreateOperationHelper.java
#	com.openexchange.office.ooxml.xlsx/src/com/openexchange/office/ooxml/xlsx/tools/RowUtils.java
#	com.openexchange.office.realtime/src/com/openexchange/office/realtime/impl/calc/CalcConnection.java