97474af94d
# Conflicts: # apps/common/main/lib/controller/Plugins.js # apps/common/main/lib/view/Header.js # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js # apps/documenteditor/main/app/view/Toolbar.js # apps/documenteditor/main/locale/sl.json # apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js # apps/presentationeditor/main/locale/ja.json # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/template/Toolbar.template # apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js |
||
---|---|---|
.. | ||
ChartSettings.template | ||
ControlSettingsDialog.template | ||
DropcapSettingsAdvanced.template | ||
FileMenu.template | ||
FormSettings.template | ||
HeaderFooterSettings.template | ||
ImageSettings.template | ||
ImageSettingsAdvanced.template | ||
LeftMenu.template | ||
MailMerge.template | ||
MailMergeEmailDlg.template | ||
ParagraphSettings.template | ||
ParagraphSettingsAdvanced.template | ||
RightMenu.template | ||
ShapeSettings.template | ||
SignatureSettings.template | ||
StatusBar.template | ||
TableSettings.template | ||
TableSettingsAdvanced.template | ||
TextArtSettings.template | ||
Toolbar.template | ||
ToolbarView.template | ||
Viewport.template | ||
WatermarkSettings.template |