mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-04-07 13:55:33 +08:00
# Conflicts: # DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js # PdfFile/OnlineOfficeBinToPdf.cpp # PdfFile/PdfEditor.cpp # PdfFile/PdfFile.cpp # PdfFile/PdfFile.h # PdfFile/SrcReader/PdfAnnot.cpp # PdfFile/SrcReader/PdfAnnot.h # PdfFile/SrcWriter/Document.cpp # PdfFile/SrcWriter/Document.h # PdfFile/test/test.cpp