mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-07-20 03:55:47 +08:00
# Conflicts: # DesktopEditor/graphics/pro/js/wasm/js/drawingfile_base.js # DesktopEditor/graphics/pro/js/wasm/src/drawingfile.h # DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp # PdfFile/PdfFile.h # PdfFile/PdfReader.cpp # PdfFile/PdfReader.h