f62aa45b18
# Conflicts: # apps/common/main/resources/img/toolbar/1x/big/.css.handlebars # apps/common/main/resources/less/asc-mixins.less # apps/common/main/resources/less/buttons.less # apps/common/main/resources/less/checkbox.less # apps/common/main/resources/less/combo-dataview.less # apps/common/main/resources/less/comments.less # apps/common/main/resources/less/common.less # apps/common/main/resources/less/dataview.less # apps/common/main/resources/less/dropdown-menu.less # apps/common/main/resources/less/listview.less # apps/common/main/resources/less/multislider-gradient.less # apps/common/main/resources/less/radiobox.less # apps/common/main/resources/less/scroller.less # apps/common/main/resources/less/separator.less # apps/common/main/resources/less/theme-colorpalette.less # apps/common/main/resources/less/toolbar.less # apps/common/main/resources/less/window.less # apps/documenteditor/main/resources/less/advanced-settings.less # apps/documenteditor/main/resources/less/filemenu.less # apps/documenteditor/main/resources/less/leftmenu.less # apps/documenteditor/main/resources/less/rightmenu.less # apps/documenteditor/main/resources/less/statusbar.less # apps/documenteditor/main/resources/less/toolbar.less # apps/presentationeditor/main/resources/less/leftmenu.less # apps/presentationeditor/main/resources/less/rightmenu.less # apps/presentationeditor/main/resources/less/statusbar.less # apps/spreadsheeteditor/main/resources/less/celleditor.less # apps/spreadsheeteditor/main/resources/less/leftmenu.less # apps/spreadsheeteditor/main/resources/less/rightmenu.less # apps/spreadsheeteditor/main/resources/less/statusbar.less # apps/spreadsheeteditor/main/resources/less/toolbar.less |
||
|---|---|---|
| .. | ||
| collection | ||
| controller | ||
| model | ||
| template | ||
| view | ||