web-apps/apps/spreadsheeteditor/main/resources
Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table
# Conflicts:
#	apps/common/main/resources/less/loadmask.less
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/FileMenuPanels.js
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/presentationeditor/main/app/controller/RightMenu.js
#	apps/presentationeditor/main/app/view/FileMenuPanels.js
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-06 14:42:56 +03:00
..
formula-lang [se] Fix "T" function name 2021-01-22 11:30:27 +03:00
help Update help 2021-01-20 20:42:21 +03:00
img Update wrap icon 2020-12-23 13:46:59 +03:00
less Merge branch 'develop' into feature/colors-table 2021-02-06 14:42:56 +03:00