Kulikova Svetlana 607c9b57f7 Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter ...

# Conflicts:
#	Common/3dParty/html/css/src/CCompiledStyle.cpp
#	Common/3dParty/html/css/src/ConstValues.h
#	Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
#	HtmlFile2/htmlfile2.cpp

2022-06-09 17:19:14 +03:00

..

js

Refactoring zip module

2022-05-30 11:45:41 +03:00

OfficeUtils.xcodeproj

[ios][documents] fix build

2019-10-29 16:07:35 +03:00

src

Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter

2022-06-09 17:19:14 +03:00

win32

.

2018-04-20 13:35:30 +03:00

OfficeUtils.pri

Merge branch 'develop' into fix/drawing_file_client

2021-11-25 10:47:56 +03:00

OfficeUtils.pro

1

2018-04-10 18:24:49 +03:00