|
|
45490a1e2c
|
Merge branch 'develop' into feature/external-data-diagrams
# Conflicts:
# apps/common/main/lib/util/LanguageInfo.js
# apps/common/main/lib/view/FormatSettingsDialog.js
# apps/documenteditor/main/app/controller/DocumentHolder.js
# apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
# apps/pdfeditor/main/app/controller/DocumentHolder.js
# apps/presentationeditor/main/app/controller/DocumentHolder.js
# apps/presentationeditor/main/app/controller/Toolbar.js
# apps/spreadsheeteditor/main/app/controller/DataTab.js
# apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
# apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
# apps/spreadsheeteditor/main/app/view/Statusbar.js
# apps/spreadsheeteditor/main/app/view/Toolbar.js
|
2025-06-25 17:50:11 +03:00 |
|